diff --git a/app/assets/javascripts/translations-not-coffee.js.erb b/app/assets/javascripts/translations-not-coffee.js.erb
deleted file mode 100644
index 480362c1..00000000
--- a/app/assets/javascripts/translations-not-coffee.js.erb
+++ /dev/null
@@ -1,74 +0,0 @@
-$translations = {
-  en: {
-    models: <%= I18n.t('activemodel.models', locale: :en).to_json %>,
-    attributes: <%= I18n.t('activemodel.attributes', locale: :en).to_json %>,
-    helpers: <%= I18n.t('helpers', locale: :en).to_json %>,
-    pagination: <%= I18n.t('views.pagination', locale: :en).to_json %>,
-  },
-  nl: {
-    models: <%= I18n.t('activemodel.models', locale: :nl).to_json %>,
-    attributes: <%= I18n.t('activemodel.attributes', locale: :nl).to_json %>,
-    helpers: <%= I18n.t('helpers', locale: :nl).to_json %>,
-    pagination: <%= I18n.t('views.pagination', locale: :nl).to_json %>,
-  }
-}
-
-$transformation_mappings = {
-  downcase: 'toLowerCase',
-  upcase: 'toUpperCase'
-}
-
-function t(path, vars){
-  vars || (vars = {});
-  var result, m, translatable, isafety,replacable;
-  var parts = path.split('.');
-  var accessor = '$translations.'+$locale+'["' + parts.join('"]["')+ '"]';
-  try{
-    result = eval(accessor);
-  } catch(err){
-    result = parts[parts.length - 1].capitalize();
-  }
-  if(result == '') return '';
-  if(!result) return parts[parts.length - 1].capitalize();
-  $.each(vars, function(v, value){ result = result.replace('%{'+v+'}', value)});
-  isafety = 0;
-  while(result.indexOf('${') > -1){
-    m = result.match(/\${([\w\.]+(\|\w+)?)}/);
-    if(m[2]){
-      translatable = m[1].replace(m[2], '');
-      operation = $transformation_mappings[m[2].substr(1) || m[2].substr(1)];
-    }else{
-      translatable = m[1];
-      operation = null;
-    }
-    replacable = t(translatable);
-    if(operation) replacable = replacable[operation]();
-    result = result.replace(m[0], replacable);
-    if(isafety > 10) break;
-    isafety += 1;
-  }
-  return result;
-}
-function setLocale(locale){
-  Qstorage.setItem('locale', locale);
-  $locale = locale;
-  setTranslations();
-}
-function setTranslations(selector){
-  var list = $('#top-navigation-list');
-  list.find('.locale').show();
-  list.find('.locale-'+$locale).hide();
-  moment.lang($locale);
-  if(selector){
-    $(selector).find('[data-t]').each(function(){$(this).html(t($(this).data('t'), $(this).data('tAttributes')))})
-    $(selector).find('*[data-time]').each(function(){
-      $(this).text(moment($(this).data('time')).format($(this).data('timeFormat') || 'dd D MMM HH:mm'))
-    })
-  }else{
-    $('[data-t]').each(function(){$(this).html(t($(this).data('t'),$(this).data('tAttributes')))})
-    $('*[data-time]').each(function(){
-      $(this).text(moment($(this).data('time')).format($(this).data('timeFormat') || 'dd D MMM HH:mm'))
-    })
-  }
-  $('.datepicker').datepicker("option", $.datepicker.regional[$locale])
-}
diff --git a/app/assets/javascripts/user/app/application.js.coffee b/app/assets/javascripts/user/app/manifest.js.coffee
similarity index 96%
rename from app/assets/javascripts/user/app/application.js.coffee
rename to app/assets/javascripts/user/app/manifest.js.coffee
index c27f5294..24cae119 100644
--- a/app/assets/javascripts/user/app/application.js.coffee
+++ b/app/assets/javascripts/user/app/manifest.js.coffee
@@ -1,5 +1,5 @@
 #= require_self
-#= require jquery.touchSwipe
+# require jquery.touchSwipe
 #= require handlebars
 #= require ember
 #= require ember-data
diff --git a/app/assets/javascripts/user/app/views/application_view.js.coffee b/app/assets/javascripts/user/app/views/application_view.js.coffee
index 2d5d94f9..122820b2 100644
--- a/app/assets/javascripts/user/app/views/application_view.js.coffee
+++ b/app/assets/javascripts/user/app/views/application_view.js.coffee
@@ -1,19 +1,31 @@
 App.ApplicationView = Ember.View.extend
   didInsertElement: ->
     # Side menu collapsing
-    targets = @$('.side-menu')
-    targets.addClass('closed').click -> targets.toggleClass('active').addClass('clicked').toggleClass('closed')
+    side_menu = @$('.side-menu')
+    side_menu.addClass('closed').click -> side_menu.toggleClass('active').addClass('clicked').toggleClass('closed')
     controller = @get('controller')
-    @$('.main-section').swipe
-      swipe: (event, direction, distance, duration, fingerCount) ->
-        if fingerCount is 2
-          if direction is "right"
-            targets.addClass('active clicked').removeClass('closed')
-          if direction is "left"
-            targets.removeClass('active').addClass('closed')
-        if fingerCount is 3 and direction is "up"
-          controller.transitionToRoute "settings"
-      fingers: 'all'
+    #@$('.main-section').swipe
+      #swipe: (event, direction, distance, duration, fingerCount) ->
+        #if fingerCount is 2
+          #if direction is "right"
+            #side_menu.addClass('active clicked').removeClass('closed')
+          #if direction is "left"
+            #side_menu.removeClass('active').addClass('closed')
+        #if fingerCount is 3 and direction is "up"
+          #controller.transitionToRoute "settings"
+      #fingers: 'all'
+    document.addEventListener "backbutton", =>
+      # close side menu if open
+      if side_menu.hasClass('active')
+        side_menu.click()
+      else
+        # close the app when on the index route
+        if @controller.currentPath is 'index'
+          navigator.app.exitApp()
+        else
+          # go to index route otherwise
+          @controller.transitionToRoute 'index'
+    document.addEventListener "menubutton", -> side_menu.click()
 
     #ios7 detection
     if window.device and window.device.platform and window.device.platform.toLowerCase() is "ios" and parseFloat(window.device.version) >= 7.0
diff --git a/app/assets/javascripts/user/flat/application.js.coffee.erb b/app/assets/javascripts/user/flat/application.js.coffee.erb
index d1714a13..adecdeca 100644
--- a/app/assets/javascripts/user/flat/application.js.coffee.erb
+++ b/app/assets/javascripts/user/flat/application.js.coffee.erb
@@ -1,5 +1,5 @@
 #= require jquery
-#= require ../app/application
+#= require ../app/manifest
 #= require faye
 #= require moment
 #= require translations
diff --git a/app/assets/stylesheets/user/foundation/_structure.css.sass b/app/assets/stylesheets/user/foundation/_structure.css.sass
index 3a4cc9a3..bedcfdde 100644
--- a/app/assets/stylesheets/user/foundation/_structure.css.sass
+++ b/app/assets/stylesheets/user/foundation/_structure.css.sass
@@ -26,6 +26,8 @@ body
   bottom: 0
   overflow-y: scroll
   -webkit-overflow-scrolling: touch
+  //z-index: 0
+  //-webkit-transform: translateZ(0px)
   .main-section-content
     //nothing
 span.icon
diff --git a/config/version b/config/version
index 051fc56b..f81283f3 100644
--- a/config/version
+++ b/config/version
@@ -1 +1 @@
-0.9.28
+0.9.40