@@ -586,12 +586,12 @@
             return 'plus'
         if item[0] == '-':
             return 'minus'
 
     if request.vars:
-        c = ''.join([item[2:] for (i, item) in enumerate(d) if item[0] \
-                     == ' ' or 'line%i' % i in request.vars])
+        c = '\n'.join([item[2:].rstrip() for (i, item) in enumerate(d) if item[0] \
+                           == ' ' or 'line%i' % i in request.vars])
         safe_write(path, c)
         session.flash = 'files merged'
         redirect(URL('edit', args=request.args))
     else:
         # Making the short circuit compatible with <= python2.4
@@ -708,12 +708,12 @@
         data = safe_read(apath('%s/controllers/%s' % (app, c), r=request))
         items = regex_expose.findall(data)
         functions[c] = items
 
     # Get all views
-    views = sorted(listdir(apath('%s/views/' % app, r=request), '[\w/\-]+\.\w+$'))
-    views = [x.replace('\\','/') for x in views]
+    views = sorted(listdir(apath('%s/views/' % app, r=request), '[\w/\-]+(\.\w+)+$'))
+    views = [x.replace('\\','/') for x in views if not x.endswith('.bak')]
     extend = {}
     include = {}
     for c in views:
         data = safe_read(apath('%s/views/%s' % (app, c), r=request))
         items = regex_extend.findall(data)
@@ -1190,11 +1190,11 @@
     """ Update available languages """
 
     app = get_app()
     update_all_languages(apath(app, r=request))
     session.flash = T('Language files (static strings) updated')
-    redirect(URL('design',args=app))
+    redirect(URL('design',args=app,anchor='languages'))
 
 def twitter():
     session.forget()
     session._unlock(response)
     import gluon.tools
@@ -1215,8 +1215,9 @@
         return dict(form=auth())
     else:
         return dict(form=T("Disabled"))
 
 def reload_routes():
-   """ Reload routes.py """
-   gluon.rewrite.load()
-   redirect(URL('site'))
+    """ Reload routes.py """
+    import gluon.rewrite
+    gluon.rewrite.load()
+    redirect(URL('site'))