diff --git a/period/templates/cycle/create.html b/period/templates/cycle/create.html
index 360a7c9..863c3a6 100644
--- a/period/templates/cycle/create.html
+++ b/period/templates/cycle/create.html
@@ -1,15 +1,31 @@
 {% extends 'base.html' %}
 
-{% block header %}
-  <h1>{% block title %}New Cycle{% endblock %}</h1>
-{% endblock %}
-
 {% block content %}
+
+
+<div class="container-fluid">
+  <div class="table-responsive">
+  <div class="table-wrapper">
+    <div class="table-title">
+        <div class="row">
+          <div class="col-sm-6">
+            {% block header %}
+            <h2>{% block title %}New Cycle{% endblock %}</h2>
+            {% endblock %}
+          </div>
+          <div class="col-sm-6">
+            <a class="btn btn-primary" href="{{ url_for('cycles.create') }}">New Cycle</a>
+          </div>
+        </div>
+    </div>
+
   <form method="post">
     <label for="start_time">Start Time</label>
     <input name="start_time" id="title" value="{{ request.form['start_time'] }}" required type="date">
+    <br><br>
     <label for="end_time">End Time</label>
     <input name="end_time" id="end_time" value="{{ request.form['end_time'] }}" type="date">
+    <br>
     <input type="submit" value="Save">
   </form>
 {% endblock %}
\ No newline at end of file
diff --git a/period/templates/cycle/index.html b/period/templates/cycle/index.html
index 8861ed6..c89d59b 100644
--- a/period/templates/cycle/index.html
+++ b/period/templates/cycle/index.html
@@ -24,7 +24,7 @@
                 <h5 class="card-title">
                   {% if cycle['cycle_length'] %}
                     {% if loop.first %}
-                      Day <b>{{ cycle['cycle_length'] }}</b>
+                      Day <b>{{ cycle['cycle_length'] - 1 }}</b>
                     {% else %}
                       <b>{{ cycle['cycle_length'] }}</b> days.
                     {% endif %}
diff --git a/period/templates/cycle/update.html b/period/templates/cycle/update.html
index 6eb0b24..e71062b 100644
--- a/period/templates/cycle/update.html
+++ b/period/templates/cycle/update.html
@@ -1,13 +1,28 @@
 {% extends 'base.html' %}
 
-{% block header %}
-  <h1>{% block title %}Edit Cycle{% endblock %}</h1>
-{% endblock %}
-
 {% block content %}
+
+
+<div class="container-fluid">
+  <div class="table-responsive">
+  <div class="table-wrapper">
+    <div class="table-title">
+        <div class="row">
+          <div class="col-sm-6">
+            {% block header %}
+            <h2>{% block title %}Edit Cycle{% endblock %}</h2>
+            {% endblock %}
+          </div>
+          <div class="col-sm-6">
+            <a class="btn btn-primary" href="{{ url_for('cycles.create') }}">New Cycle</a>
+          </div>
+        </div>
+    </div>
+
   <form method="post">
     <label for="start_time">Start Time</label>
     <input name="start_time" id="title" value="{{ request.form['start_time'] or cycle['start_time'][:10] }}" required type="date">
+    <br>
     <label for="end_time">End Time</label>
     <input name="end_time" id="end_time" value="{{ request.form['end_time'] or cycle['end_time'][:10] if cycle['end_time'] is not none }}" type="date">
     <input type="submit" value="Save">