diff --git a/friends/lib/friends/accounts/user.ex b/friends/lib/friends/accounts/user.ex
index e63a464..9f85586 100644
--- a/friends/lib/friends/accounts/user.ex
+++ b/friends/lib/friends/accounts/user.ex
@@ -9,6 +9,8 @@ defmodule Friends.Accounts.User do
     field :confirmed_at, :naive_datetime
 
     timestamps()
+
+    has_one :profile, Friends.Friend
   end
 
   @doc """
@@ -47,7 +49,7 @@ defmodule Friends.Accounts.User do
   defp validate_password(changeset, opts) do
     changeset
     |> validate_required([:password])
-    |> validate_length(:password, min: 12, max: 72)
+    |> validate_length(:password, min: 6, max: 72)
     # |> validate_format(:password, ~r/[a-z]/, message: "at least one lower case character")
     # |> validate_format(:password, ~r/[A-Z]/, message: "at least one upper case character")
     # |> validate_format(:password, ~r/[!?@#$%^&*_0-9]/, message: "at least one digit or punctuation character")
diff --git a/friends/lib/friends/accounts/user_notifier.ex b/friends/lib/friends/accounts/user_notifier.ex
index b8d4806..c3cec41 100644
--- a/friends/lib/friends/accounts/user_notifier.ex
+++ b/friends/lib/friends/accounts/user_notifier.ex
@@ -8,7 +8,7 @@ defmodule Friends.Accounts.UserNotifier do
     email =
       new()
       |> to(recipient)
-      |> from({"Friends", "contact@example.com"})
+      |> from({"Friends App", "ryan@pandu.ski"})
       |> subject(subject)
       |> text_body(body)
 
diff --git a/friends/lib/friends/friend.ex b/friends/lib/friends/friend.ex
index 62294f5..d2b4f48 100644
--- a/friends/lib/friends/friend.ex
+++ b/friends/lib/friends/friend.ex
@@ -16,7 +16,7 @@ defmodule Friends.Friend do
     field(:slug, :string)
     field(:memories, {:array, :string})
 
-    # has_many(:photos, Media.Photo)
+    belongs_to :user, Friends.Accounts.User, foreign_key: :user_id
 
     many_to_many(
       :relationships,
diff --git a/friends/lib/friends_web/controllers/friend_controller.ex b/friends/lib/friends_web/controllers/friend_controller.ex
new file mode 100644
index 0000000..8709ee7
--- /dev/null
+++ b/friends/lib/friends_web/controllers/friend_controller.ex
@@ -0,0 +1,13 @@
+defmodule FriendsWeb.FriendController do
+  use FriendsWeb, :controller
+  alias Friends.{Friend, Relationship}
+  alias Friends.Accounts.User
+  import Helpers
+
+  def index(conn, _params) do
+
+    conn
+    |> assign(:all_friends, Friend.all)
+    |> render("index.html")
+  end
+end
diff --git a/friends/lib/friends_web/router.ex b/friends/lib/friends_web/router.ex
index 125b8dd..5727e62 100644
--- a/friends/lib/friends_web/router.ex
+++ b/friends/lib/friends_web/router.ex
@@ -21,6 +21,8 @@ defmodule FriendsWeb.Router do
     pipe_through :browser
 
     get "/", PageController, :index
+    get "/friends", FriendController, :index
+
     live "/friend/:slug", FriendsLive.Show
 
   end
diff --git a/friends/lib/friends_web/templates/friend/index.html.heex b/friends/lib/friends_web/templates/friend/index.html.heex
new file mode 100644
index 0000000..355e334
--- /dev/null
+++ b/friends/lib/friends_web/templates/friend/index.html.heex
@@ -0,0 +1,13 @@
+<h1>All Friends</h1>
+
+<ul class="text-xl">
+    <%= for f <- @all_friends do %>
+        <li>
+            <.link href={"/friend/#{f.slug}"}><%= f.name %></.link>            
+            <%= if f.id == @current_user.profile.id do %>
+            (you)
+            <% end %>
+        </li>
+    <% end %>
+</ul>
+
diff --git a/friends/lib/friends_web/templates/layout/_user_menu.html.heex b/friends/lib/friends_web/templates/layout/_user_menu.html.heex
index 3c51608..222fbe2 100644
--- a/friends/lib/friends_web/templates/layout/_user_menu.html.heex
+++ b/friends/lib/friends_web/templates/layout/_user_menu.html.heex
@@ -1,10 +1,16 @@
-<ul class="mt-3 p-2 shadow menu menu-compact dropdown-content bg-base-100 text-neutral rounded-box w-52">
 <%= if @current_user do %>
-  <li><%= @current_user.email %></li>
-  <li><%= link "Settings", to: Routes.user_settings_path(@conn, :edit) %></li>
-  <li><%= link "Log out", to: Routes.user_session_path(@conn, :delete), method: :delete %></li>
+    <label tabindex="0" class="btn btn-ghost btn-circle avatar">
+      <div class="w-10 rounded-full">
+        <img src="https://placeimg.com/80/80/people" />
+      </div>
+    </label>
+    <ul class="mt-3 p-2 shadow menu menu-compact dropdown-content bg-base-100 text-neutral rounded-box w-52">
+    <li><%= @current_user.email %></li>
+    <li><%= link "Settings", to: Routes.user_settings_path(@conn, :edit) %></li>
+    <li><%= link "Log out", to: Routes.user_session_path(@conn, :delete), method: :delete %></li>
+  </ul>
 <% else %>
-  <li><%= link "Register", to: Routes.user_registration_path(@conn, :new) %></li>
-  <li><%= link "Log in", to: Routes.user_session_path(@conn, :new) %></li>
+  <%= link "Log in", to: Routes.user_session_path(@conn, :new), class: "btn" %>
+  <%= link "Register", to: Routes.user_registration_path(@conn, :new), class: "btn btn-primary" %>
 <% end %>
-</ul>
+
diff --git a/friends/lib/friends_web/templates/layout/app.html.heex b/friends/lib/friends_web/templates/layout/app.html.heex
index 3b371f3..c406f46 100644
--- a/friends/lib/friends_web/templates/layout/app.html.heex
+++ b/friends/lib/friends_web/templates/layout/app.html.heex
@@ -4,17 +4,14 @@
       <.link navigate={"/"} class="btn btn-ghost normal-case text-xl">Friends</.link>
     </div>
     <div class="dropdown dropdown-end">
-        <label tabindex="0" class="btn btn-ghost btn-circle avatar">
-          <div class="w-10 rounded-full">
-            <img src="https://placeimg.com/80/80/people" />
-          </div>
-        </label>
         <%= render("_user_menu.html", conn: @conn, current_user: @current_user) %>
       </div>
   </div>
 </div>
 <div class="mx-auto w-full lg:w-3/4">      
   <main class="container p-4 mb-10 md:p-8 prose">
+  <p class="alert alert-info" role="alert"><%= get_flash(@conn, :info) %></p>
+  <p class="alert alert-danger" role="alert"><%= get_flash(@conn, :error) %></p>
     <%= @inner_content %>
   </main>
 </div>
diff --git a/friends/lib/friends_web/views/friend_view.ex b/friends/lib/friends_web/views/friend_view.ex
new file mode 100644
index 0000000..25950cc
--- /dev/null
+++ b/friends/lib/friends_web/views/friend_view.ex
@@ -0,0 +1,6 @@
+defmodule FriendsWeb.FriendView do
+  use FriendsWeb, :view
+  import Phoenix.Component
+  import Helpers
+
+end
diff --git a/friends/priv/repo/migrations/20221025010213_profile_belongs_to_user.exs b/friends/priv/repo/migrations/20221025010213_profile_belongs_to_user.exs
new file mode 100644
index 0000000..37e14c8
--- /dev/null
+++ b/friends/priv/repo/migrations/20221025010213_profile_belongs_to_user.exs
@@ -0,0 +1,9 @@
+defmodule Friends.Repo.Migrations.ProfileBelongsToUser do
+  use Ecto.Migration
+
+  def change do
+    alter table(:friends) do
+      add :user_id, references(:users)
+    end
+  end
+end
diff --git a/friends/test/friends_web/controllers/page_controller_test.exs b/friends/test/friends_web/controllers/page_controller_test.exs
index a6e74d8..6b4f8d4 100644
--- a/friends/test/friends_web/controllers/page_controller_test.exs
+++ b/friends/test/friends_web/controllers/page_controller_test.exs
@@ -3,6 +3,6 @@ defmodule FriendsWeb.PageControllerTest do
 
   test "GET /", %{conn: conn} do
     conn = get(conn, "/")
-    assert html_response(conn, 200) =~ "Welcome to Phoenix!"
+    assert html_response(conn, 200) =~ "Friends App"
   end
 end