diff --git a/app/controllers/habits_controller.rb b/app/controllers/habits_controller.rb
index 6c352eeef0b44bde04a50ee361798d965e6945ae..0234e2a689569c65406035a09f540b0b7ebe06e2 100644
--- a/app/controllers/habits_controller.rb
+++ b/app/controllers/habits_controller.rb
@@ -76,8 +76,10 @@ class HabitsController < ApplicationController
         format.html { redirect_to :root, notice: 'You have already done that today. Come back tomorrow!'  }
       end
     end
-
-    if @habit.streak > @habit.max_streak || @habit.max_streak.nil?
+    if @habit.max_streak.nil?
+      @habit.max_streak = @habit.streak
+      @habit.save
+    elsif @habit.streak > @habit.max_streak
       @habit.max_streak = @habit.streak
       @habit.save
     end
diff --git a/app/views/goals/_showgoals.html.erb b/app/views/goals/_showgoals.html.erb
index cc83829497679b91d62b8b490ee88fbf9adab3b6..fc0a0f90bf99c237067d81accb76469154645c71 100644
--- a/app/views/goals/_showgoals.html.erb
+++ b/app/views/goals/_showgoals.html.erb
@@ -1,6 +1,3 @@
-<div class="container text-center custom-page-heading">
-  <h1>Goals</h1>
-</div>
 <div class="container text-center custom-page-heading">
   <%= link_to t('.back'), root_path, :class => "btn float-left habit-back-btn" %>
   <%=button_to ('Your goals'),goals_path , method: :get,class:"btn float-left btn-info btn-md"%>
diff --git a/app/views/goals/completed.html.erb b/app/views/goals/completed.html.erb
index 76ad67ee385c06f57e99f39c4a328f0f0755323d..ac1748e775f7d9ec87bf97c614a1af752df34f57 100644
--- a/app/views/goals/completed.html.erb
+++ b/app/views/goals/completed.html.erb
@@ -1 +1,4 @@
-  <%= render 'showgoals', goals: @goals %>
+<div class="container text-center custom-page-heading">
+  <h1>Completed Goals</h1>
+</div>
+<%= render 'showgoals', goals: @goals %>
diff --git a/app/views/goals/index.html.erb b/app/views/goals/index.html.erb
index 76ad67ee385c06f57e99f39c4a328f0f0755323d..3866a5226a72eba551b8af1222b871541890023f 100644
--- a/app/views/goals/index.html.erb
+++ b/app/views/goals/index.html.erb
@@ -1 +1,4 @@
-  <%= render 'showgoals', goals: @goals %>
+<div class="container text-center custom-page-heading">
+  <h1>Goals</h1>
+</div>
+<%= render 'showgoals', goals: @goals %>
diff --git a/app/views/habits/_habit.html.erb b/app/views/habits/_habit.html.erb
index 01e0d2c04e308b2dc7d423f60498ba651b8c46fb..d536e1af0e43e91eb00b21b076d4ca7f21adfb8d 100644
--- a/app/views/habits/_habit.html.erb
+++ b/app/views/habits/_habit.html.erb
@@ -19,13 +19,13 @@
     <div class="habit-index-mobile-icons-container">
       <div class="row">
         <div class="col pl-1 pr-1">
-          <%=link_to raw("<i class='fas fa-edit fa-lg'></i>"), root_path, method: :get, class:"btn btn-info mobile-index-icon" %>
+          <%=link_to raw("<i class='fas fa-edit fa-lg'></i>"), track_habit_path(habit), method: :post, class:"btn btn-info mobile-index-icon" %>
         </div>
         <div class="col pl-1 pr-1">
-          <%=link_to raw("<i class='far fa-calendar-alt fa-lg'></i>"), root_path, method: :get, class:"btn btn-info mobile-index-icon" %>
+          <%=link_to raw("<i class='far fa-calendar-alt fa-lg'></i>"), habit_schedules_path(habit), method: :get, class:"btn btn-info mobile-index-icon" %>
         </div>
         <div class="col pl-1 pr-1">
-          <%=link_to raw("<i class='fas fa-cogs fa-lg'></i>"), habit, method: :delete, data: { confirm: 'Are you sure?' }, class:"btn btn-info mobile-index-icon" %>
+          <%=link_to raw("<i class='fas fa-cogs fa-lg'></i>"), edit_habit_path(habit), method: :get, class:"btn btn-info mobile-index-icon" %>
         </div>
       </div>
     </div>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 31a73d4e0814f74726948617133ab7ba2dd7eafa..3712d7b6fd17b050dbec100db6a0a84a9b17b781 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -23,5 +23,6 @@
 
   <footer>
     <%= render 'cookies_eu/consent_banner', link: '/policy/cookie-notice', target: '_blank'%>
+    <%= render 'shared/footer' %>
   </footer>
 </html>
diff --git a/app/views/shared/_footer.html.erb b/app/views/shared/_footer.html.erb
new file mode 100644
index 0000000000000000000000000000000000000000..3aa32c66010fd1c7ac405508a1dda74e79146599
--- /dev/null
+++ b/app/views/shared/_footer.html.erb
@@ -0,0 +1,5 @@
+<div style="position: fixed; bottom: 0; left: 0; right: 0; background:#343A40; color: white;text-align:center;">
+  <%=link_to "Cookie Policy", policy_cookie_notice_path%> |
+  <%=link_to "Privacy Policy", policy_privacy_path%> |
+  <%=link_to "Security Policy", policy_security_path%>
+</div>
\ No newline at end of file