diff --git a/AppShell.xaml b/AppShell.xaml
index a0141f4..ea876cf 100644
--- a/AppShell.xaml
+++ b/AppShell.xaml
@@ -76,19 +76,9 @@
         <ShellContent
             Title="MyRecipesPage"
             ContentTemplate="{DataTemplate pages:MyRecipesPage}"
-<<<<<<< HEAD
             Route="MyRecipe"/>
     </FlyoutItem>
     <FlyoutItem Title="ProfilePage">
-=======
-            Route="MyRecipes" />
-
-        <ShellContent
-            Title="Create Recipe Page"
-            ContentTemplate="{DataTemplate pages:CreateRecipePage}"
-            Route="CreateRecipe" />
-                
->>>>>>> c7f7e36bffbc11c12286a9092fbd9b109829a2a1
         <ShellContent
             Title="ProfilePage"
             ContentTemplate="{DataTemplate pages:ProfilePage}"
@@ -101,4 +91,11 @@
             ContentTemplate="{DataTemplate pages:ForgotPassword}"
             Route="ForgotPassword"/>
     </FlyoutItem>
+    <FlyoutItem>
+        <ShellContent
+            x:Name="CreateRecipe"
+            Title="CreateRecipe"
+            ContentTemplate="{DataTemplate pages:CreateRecipePage}"
+            Route="CreateRecipe"/>
+    </FlyoutItem>
 </Shell>
\ No newline at end of file
diff --git a/Pages/CreateRecipePage.xaml b/Pages/CreateRecipePage.xaml
index 58fc1b1..63cd5f7 100644
--- a/Pages/CreateRecipePage.xaml
+++ b/Pages/CreateRecipePage.xaml
@@ -17,7 +17,8 @@
                 HeightRequest="50"
                 WidthRequest="50"
                 Source="arrow_back.svg"
-                HorizontalOptions="Start"/>
+                HorizontalOptions="Start"
+                Clicked="OnBackButtonClicked"/>
 
             <Label 
                 Text="Create new recipe"
diff --git a/Pages/CreateRecipePage.xaml.cs b/Pages/CreateRecipePage.xaml.cs
index 7cacaa7..51c2c2d 100644
--- a/Pages/CreateRecipePage.xaml.cs
+++ b/Pages/CreateRecipePage.xaml.cs
@@ -18,4 +18,8 @@ public partial class CreateRecipePage : ContentPage
     {
         StepList.Children.Add(new StepEntry((uint) StepList.Children.Count() + 1));
     }
+    private async void OnBackButtonClicked(object sender, EventArgs e)
+    {
+        await Navigation.PopAsync();
+    }
 }
\ No newline at end of file
diff --git a/Pages/MyRecipesPage.xaml b/Pages/MyRecipesPage.xaml
index 907c9ff..34835d0 100644
--- a/Pages/MyRecipesPage.xaml
+++ b/Pages/MyRecipesPage.xaml
@@ -60,7 +60,8 @@
             <Button
                 Style="{StaticResource UserButton}"
                 BackgroundColor="{StaticResource Selected}"
-                Text="Add a new recipe"/>
+                Text="Add a new recipe"
+                Clicked="AddRecipeButtonClicked"/>
         </Border>
     </Grid>
 </ContentPage>
\ No newline at end of file
diff --git a/Pages/MyRecipesPage.xaml.cs b/Pages/MyRecipesPage.xaml.cs
index cc7982c..cabf0bf 100644
--- a/Pages/MyRecipesPage.xaml.cs
+++ b/Pages/MyRecipesPage.xaml.cs
@@ -11,4 +11,9 @@ public partial class MyRecipesPage : ContentPage
     {
         await Navigation.PopAsync();
     }
+    private async void AddRecipeButtonClicked(object sender, EventArgs e)
+    {
+        await Shell.Current.Navigation.PushAsync(new CreateRecipePage());
+        
+    }
 }
\ No newline at end of file
diff --git a/Pages/RecipePage.xaml b/Pages/RecipePage.xaml
index 10b10ac..32679e9 100644
--- a/Pages/RecipePage.xaml
+++ b/Pages/RecipePage.xaml
@@ -25,13 +25,11 @@
                     AlignItems="Center">
                     
                     <ImageButton 
-<<<<<<< HEAD
+
                         Source="arrow_back.svg"
                         Clicked="OnBackButtonClicked"/>
-=======
-                        Source="arrow_back.svg"/>
-                    
->>>>>>> c7f7e36bffbc11c12286a9092fbd9b109829a2a1
+
+
                     <Label 
                         Style="{StaticResource h1}"
                         x:Name="RecipeName"