diff --git a/app/controllers/people_controller.rb b/app/controllers/people_controller.rb
index b38de87d163b407e362c26035cf8ed7d38c2292b..3eb24a68477e5b888a8ac640d46d7cfac9ba6b74 100644
--- a/app/controllers/people_controller.rb
+++ b/app/controllers/people_controller.rb
@@ -10,7 +10,7 @@ class PeopleController < ApplicationController
 
   def index
     @aspect = :search
-    params[:q] ||= params[:term]
+    params[:q] ||= params[:term] || ''
 
     if (params[:q][0] == 35 || params[:q][0] == '#') && params[:q].length > 1
       redirect_to "/tags/#{params[:q].gsub("#", "")}"
diff --git a/app/views/layouts/application.mobile.haml b/app/views/layouts/application.mobile.haml
index 00e2e1a29c475ee80566347a90ad421965698f6e..b88b86ff1c3fe9fb1f39486801e21a2a983a5655 100644
--- a/app/views/layouts/application.mobile.haml
+++ b/app/views/layouts/application.mobile.haml
@@ -94,8 +94,6 @@
             = current_user.name
 
           %ul{:data => {:role => 'listview', :inset => 'true'}}
-            %li
-              = link_to t('profiles.edit.your_profile'), edit_profile_path
             %li
               = link_to t('notifications.index.notifications'), notifications_path
               .ui-li-count
@@ -106,7 +104,7 @@
 
           %ul{:data => {:role => 'listview', :inset => 'true'}}
             %li
-              = link_to t('application.helper.aspect_badge.all_aspects'), aspects_path
+              = link_to t('all_aspects'), aspects_path
             - for aspect in @all_aspects
               %li
                 = link_to aspect, aspects_path('a_ids[]' => aspect.id)
diff --git a/app/views/tags/show.html.haml b/app/views/tags/show.haml
similarity index 100%
rename from app/views/tags/show.html.haml
rename to app/views/tags/show.haml