diff --git a/benchcoach/templates/benchcoach/detail.html b/benchcoach/templates/benchcoach/detail.html
new file mode 100644
index 0000000..004e935
--- /dev/null
+++ b/benchcoach/templates/benchcoach/detail.html
@@ -0,0 +1,22 @@
+{% extends 'base.html' %}
+
+{% block navbar %}
+    {% with events_tab="active" %}
+        {{ block.super }}
+    {% endwith %}
+{% endblock %}
+
+{% block page_heading %}
+    Object
+{% endblock %}
+
+{% block content %}
+    <div class="card p-0">
+        <div class="card-body p-0">
+        <table class="table m-0">
+        {% block rows %}
+        {% endblock %}
+        </table>
+        </div>
+    </div>
+{% endblock %}
\ No newline at end of file
diff --git a/benchcoach/templates/benchcoach/event-detail.html b/benchcoach/templates/benchcoach/event-detail.html
new file mode 100644
index 0000000..0670222
--- /dev/null
+++ b/benchcoach/templates/benchcoach/event-detail.html
@@ -0,0 +1,19 @@
+{% extends 'benchcoach/detail.html' %}
+
+{% block navbar %}
+    {% with events_tab="active" %}
+        {{ block.super }}
+    {% endwith %}
+{% endblock %}
+
+{% block page_heading %}
+    Event
+{% endblock %}
+
+{% block rows %}
+    <tr><th>Date</th><td>{{ event.start.date|date }}</td></tr>
+    <tr><th>Time</th><td>{{ event.start.time|time }}</td></tr>
+    <tr><th>Away</th><td>{{ event.away_team.name }}</td></tr>
+    <tr><th>Home</th><td>{{ event.home_team.name }}</td></tr>
+    <tr><th>Venue</th><td>{{ event.venue }}</td></tr>
+{% endblock %}
\ No newline at end of file
diff --git a/benchcoach/templates/benchcoach/event-list.html b/benchcoach/templates/benchcoach/event-list.html
new file mode 100644
index 0000000..9cc6d81
--- /dev/null
+++ b/benchcoach/templates/benchcoach/event-list.html
@@ -0,0 +1,23 @@
+{% extends 'base.html' %}
+
+{% block navbar %}
+    {% with events_tab="active" %}
+        {{ block.super }}
+    {% endwith %}
+{% endblock %}
+
+{% block page_heading %}
+Events
+{% endblock %}
+
+{% block content %}
+    <ul class="list-group">
+        {% for event in events %}
+            <li class="list-group-item">
+                {{ event.start.date }}<br>{{ event.start.time }}<br>
+            <a href="{% url 'edit lineup' event_id=event.id %}">Edit Lineup...</a>
+            </li>
+        {% endfor %}
+    </ul>
+{% endblock %}
+</html>
\ No newline at end of file
diff --git a/lineups/templates/lineups/info-table.html b/benchcoach/templates/benchcoach/info-table.html
similarity index 80%
rename from lineups/templates/lineups/info-table.html
rename to benchcoach/templates/benchcoach/info-table.html
index 80b2581..8358bdd 100644
--- a/lineups/templates/lineups/info-table.html
+++ b/benchcoach/templates/benchcoach/info-table.html
@@ -2,7 +2,7 @@
     {% for key, value in d.items %}
         <tr>
         <th>{{ key }}</th>
-        <td>{{ value|safe }}</td>
+        <td>{{ value }}</td>
         </tr>
     {% endfor %}
 </table>
\ No newline at end of file
diff --git a/lineups/templates/lineups/lineup.html b/benchcoach/templates/benchcoach/lineup.html
similarity index 93%
rename from lineups/templates/lineups/lineup.html
rename to benchcoach/templates/benchcoach/lineup.html
index e9fc50a..1ccbe96 100644
--- a/lineups/templates/lineups/lineup.html
+++ b/benchcoach/templates/benchcoach/lineup.html
@@ -1,6 +1,6 @@
-{% extends 'base.html' %}{% block title %} {{ title }} {% endblock %}{% load crispy_forms_tags %}{% load static %}
+{% extends 'base.html' %}{% block title %} {{ title }} {% endblock %}{% load static %}
 {% with events_active="active" %}
-    {% block precontent %}
+    {% block header %}
         <div class="d-flex justify-content-center justify-content-md-center border-bottom bg-white">
             {% if previous_event %}
                 <a class="btn btn-outline-secondary btn-sm d-md-flex my-auto align-items-md-center my-3 mx-3" href="{% url 'edit lineup' event_id=previous_event.id %}" role="button">
@@ -38,7 +38,7 @@
     {% include 'messages.html' %}
     <div id="pills-tabContent" class="container-fluid tab-content my-1" data-toggle="tab">
         <div id="event-details" class="tab-pane show active" role="tabpanel" aria-labelledby="event-details-tab">
-            <form method="post" action="{% url "update from teamsnap" %}">{% csrf_token %}
+            <form method="post" action="{% url "sync teamsnap db" %}">{% csrf_token %}
                 <input type="hidden" name="event_id" value={{ event.id }}>
             <div>
                 <div class="card my-1">
@@ -54,7 +54,7 @@
                         </div>
                     </div>
                     <div class="card-body p-0">
-                        {% include 'lineups/info-table.html' with d=details %}
+                        {% include 'benchcoach/info-table.html' with d=details %}
                     </div>
                 </div>
             </div>
@@ -74,10 +74,10 @@
                                 </div>
                             </div>
                             <div class="card-body p-0">
-                                {% include 'lineups/player-table.html' with table_id="dhd" formset=formset_dhd available_class="d-none" %}
+                                {% include 'benchcoach/player-table.html' with table_id="dhd" formset=formset_dhd available_class="d-none" %}
 
                                 <hr class="m-0">
-                                {% include 'lineups/player-table.html' with table_id="lineup" formset=formset_lineup available_class="d-none"%}
+                                {% include 'benchcoach/player-table.html' with table_id="lineup" formset=formset_lineup available_class="d-none"%}
                             </div>
                         </div>
                     </div>
@@ -96,7 +96,7 @@
                             </div>
 
                             <div class="card-body p-0">
-                                {% include 'lineups/player-table.html' with table_id="bench" formset=formset_bench order_class="d-none" %}
+                                {% include 'benchcoach/player-table.html' with table_id="bench" formset=formset_bench order_class="d-none" %}
                             </div>
                         </div>
                     </div>
diff --git a/benchcoach/templates/benchcoach/list.html b/benchcoach/templates/benchcoach/list.html
new file mode 100644
index 0000000..74c9693
--- /dev/null
+++ b/benchcoach/templates/benchcoach/list.html
@@ -0,0 +1,20 @@
+{% extends 'base.html' %}
+
+{% block navbar %}
+    {% with events_tab=events_tab_active members_tab=members_tab_active opponents_tab=opponents_tab_active venues_tab=venues_tab_active %}
+        {{ block.super }}
+    {% endwith %}
+{% endblock %}
+
+{% block page_heading %}
+{{ page_title }}
+{% endblock %}
+
+{% block content %}
+    <ul class="list-group">
+        {% for object in object_list %}
+            <li class="list-group-item">{{ object }}</li>
+        {% endfor %}
+    </ul>
+{% endblock %}
+</html>
\ No newline at end of file
diff --git a/lineups/templates/lineups/player-table.html b/benchcoach/templates/benchcoach/player-table.html
similarity index 100%
rename from lineups/templates/lineups/player-table.html
rename to benchcoach/templates/benchcoach/player-table.html
diff --git a/players/__init__.py b/players/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/templates/base.html b/templates/base.html
index 740cd9e..35d3cd6 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -2,53 +2,19 @@
 <html lang="en"> {% load static %}
 
 <head>
-    <meta charset="UTF-8">
     <title>{% block title %}Title{% endblock %}</title>
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <script src="{% static 'js/bootstrap.bundle.js' %}" crossorigin="anonymous"></script>
-    <link rel="stylesheet" href="{% static 'css/bootstrap.css' %}">
-    <link rel='stylesheet' href="{% static 'css/base.css' %}">
-    <link rel="shortcut icon" type="image/png" href="{% static 'benchcoach.svg' %}">
-    <meta name="apple-mobile-web-app-capable" content="yes">
-    <meta name="apple-mobile-web-app-status-bar-style" content="default">
-    <meta name="apple-mobile-web-app-title" content="BenchCoach">
-    <meta name='viewport' content='viewport-fit=cover, width=device-width, initial-scale=1.0'>
-    <link rel="apple-touch-icon" href="{% static 'benchcoach.svg' %}">
+    {% include 'base_layout.html' %}
 </head>
 
+{% block navbar %}
+{% include 'navbar.html' %}
+{% endblock %}
+
 <body class="bg-light">
-<nav class="navbar navbar-dark navbar-expand-md bg-dark py-0">
-    <a class="navbar-brand d-flex text-uppercase fw-bold m-2 mx-4 text-dark" href="{% url 'home' %}">
-        <img class="d-inline-block" width="32" height="32" src="{% static 'benchcoach.svg' %}" />
-        <span class="d-none d-print-inline-block d-sm-inline-block d-md-inline-block d-lg-inline-block d-xl-inline-block d-xxl-inline-block mx-1 my-auto text-white">bench coach</span>
-    </a>
-    <button class="navbar-toggler m-2 mx-4 p-0" data-bs-toggle="collapse" data-bs-target="#navcol-2">
-        <span class="visually-hidden">Toggle navigation</span>
-        <span class="navbar-toggler-icon m-1"></span></button>
-    <div id="navcol-2" class="collapse navbar-collapse">
-        <ul class="navbar-nav mx-2">
-            <li class="nav-item"><a class="nav-link {{ events_tab }}" href="{% url 'events list' %}">Events</a></li>
-            <li class="nav-item"><a class="nav-link {{ members_tab }}" href="{% url 'players list' %}">Members</a></li>
-            <li class="nav-item"><a class="nav-link {{ opponents_tab }}" href="{% url 'teams list' %}">Opponents</a></li>
-            <li class="nav-item"><a class="nav-link {{ venues_tab }}" href="{% url 'venues list' %}">Venues</a></li>
-        </ul>
-        <span class="mx-auto"></span>
-        <span class="navbar-text"></span>
-        <ul class="navbar-nav mx-2">
-            <li class="nav-item dropdown">
-                <a class="dropdown-toggle nav-link" aria-expanded="false" data-bs-toggle="dropdown" href="#">{{ request.user }} <img class="rounded-circle" height="24" src="{{ request.user.profile.avatar.url }}" width="24" /></a>
-                <div class="dropdown-menu">
-                    <a class="dropdown-item" href="#">Menu Item</a>
-                </div>
-            </li>
-            <li class="nav-item"></li>
-        </ul>
-    </div>
-</nav>
-
-{% block precontent %}{% endblock %}
-
-<main role="main" class="container">
+{% block header %}
+{% endblock %}
+<main role="main" class="container my-2">
+    <h1>{% block page_heading %}{% endblock %}</h1>
     {% block content %}{% endblock %}
 </main>
 
diff --git a/templates/base_layout.html b/templates/base_layout.html
new file mode 100644
index 0000000..0f80539
--- /dev/null
+++ b/templates/base_layout.html
@@ -0,0 +1,12 @@
+{% load static %}
+<meta charset="UTF-8">
+<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+<script src="{% static 'js/bootstrap.bundle.js' %}" crossorigin="anonymous"></script>
+<link rel="stylesheet" href="{% static 'css/bootstrap.css' %}">
+<link rel='stylesheet' href="{% static 'css/base.css' %}">
+<link rel="shortcut icon" type="image/png" href="{% static 'benchcoach.svg' %}">
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="default">
+<meta name="apple-mobile-web-app-title" content="BenchCoach">
+<meta name='viewport' content='viewport-fit=cover, width=device-width, initial-scale=1.0'>
+<link rel="apple-touch-icon" href="{% static 'benchcoach.svg' %}">
\ No newline at end of file
diff --git a/templates/edit.html b/templates/edit.html
index 7b5ea60..4f9ba19 100644
--- a/templates/edit.html
+++ b/templates/edit.html
@@ -1,5 +1,5 @@
 {% extends 'base.html' %}
-{% load crispy_forms_tags %}
+
 {% block content %}
 <form action={% url call_back id=id%} method="post">
     {% csrf_token %}
diff --git a/templates/navbar.html b/templates/navbar.html
new file mode 100644
index 0000000..913464e
--- /dev/null
+++ b/templates/navbar.html
@@ -0,0 +1,29 @@
+{% load static %}
+<nav class="navbar navbar-dark navbar-expand-md bg-dark py-0">
+    <a class="navbar-brand d-flex text-uppercase fw-bold m-2 mx-4 text-dark" href="{% url 'home' %}">
+        <img class="d-inline-block" width="32" height="32" src="{% static 'benchcoach.svg' %}" />
+        <span class="d-none d-print-inline-block d-sm-inline-block d-md-inline-block d-lg-inline-block d-xl-inline-block d-xxl-inline-block mx-1 my-auto text-white">bench coach</span>
+    </a>
+    <button class="navbar-toggler m-2 mx-4 p-0" data-bs-toggle="collapse" data-bs-target="#navcol-2">
+        <span class="visually-hidden">Toggle navigation</span>
+        <span class="navbar-toggler-icon m-1"></span></button>
+    <div id="navcol-2" class="collapse navbar-collapse">
+        <ul class="navbar-nav mx-2">
+            <li class="nav-item"><a class="nav-link {{ events_tab }}" href="{% url 'event list' %}">Events</a></li>
+            <li class="nav-item"><a class="nav-link {{ members_tab }}" href="{% url 'player list' %}">Members</a></li>
+            <li class="nav-item"><a class="nav-link {{ opponents_tab }}" href="{% url 'team list' %}">Opponents</a></li>
+            <li class="nav-item"><a class="nav-link {{ venues_tab }}" href="{% url 'venue list' %}">Venues</a></li>
+        </ul>
+        <span class="mx-auto"></span>
+        <span class="navbar-text"></span>
+        <ul class="navbar-nav mx-2">
+            <li class="nav-item dropdown">
+                <a class="dropdown-toggle nav-link" aria-expanded="false" data-bs-toggle="dropdown" href="#">{{ request.user }} <img class="rounded-circle" height="24" src="{{ request.user.profile.avatar.url }}" width="24" /></a>
+                <div class="dropdown-menu">
+                    <a class="dropdown-item" href="#">Menu Item</a>
+                </div>
+            </li>
+            <li class="nav-item"></li>
+        </ul>
+    </div>
+</nav>
\ No newline at end of file