diff --git a/app/templates/auth/email/confirm.html.j2 b/app/templates/auth/email/confirm.html.j2
index a666ea7d..470ef5ba 100644
--- a/app/templates/auth/email/confirm.html.j2
+++ b/app/templates/auth/email/confirm.html.j2
@@ -1,5 +1,5 @@
 <p>Dear {{ user.username }},</p>
-<p>To confirm your account please <a href="{{ url_for('auth.confirm', token=token, _external=True) }}">click here</a>.</p>
+<p>to confirm your account please <a href="{{ url_for('auth.confirm', token=token, _external=True) }}">click here</a>.</p>
 <p>Alternatively, you can paste the following link in your browser's address bar:</p>
 <p>{{ url_for('auth.confirm', token=token, _external=True) }}</p>
 <p>Sincerely,</p>
diff --git a/app/templates/auth/email/confirm.txt.j2 b/app/templates/auth/email/confirm.txt.j2
index 41a3f17d..755fbf52 100644
--- a/app/templates/auth/email/confirm.txt.j2
+++ b/app/templates/auth/email/confirm.txt.j2
@@ -1,6 +1,6 @@
 Dear {{ user.username }},
 
-To confirm your account please click on the following link:
+to confirm your account please click on the following link:
 {{ url_for('auth.confirm', token=token, _external=True) }}
 
 Sincerely,
diff --git a/app/templates/auth/email/reset_password.html.j2 b/app/templates/auth/email/reset_password.html.j2
index 49b30f65..c07fe580 100644
--- a/app/templates/auth/email/reset_password.html.j2
+++ b/app/templates/auth/email/reset_password.html.j2
@@ -1,5 +1,5 @@
 <p>Dear {{ user.username }},</p>
-<p>To reset your password <a href="{{ url_for('auth.reset_password', token=token, _external=True) }}">click here</a>.</p>
+<p>to reset your password <a href="{{ url_for('auth.reset_password', token=token, _external=True) }}">click here</a>.</p>
 <p>Alternatively, you can paste the following link in your browser's address bar:</p>
 <p>{{ url_for('auth.reset_password', token=token, _external=True) }}</p>
 <p>If you have not requested a password reset simply ignore this message.</p>
diff --git a/app/templates/auth/email/reset_password.txt.j2 b/app/templates/auth/email/reset_password.txt.j2
index 5d86e46f..9c17f6f2 100644
--- a/app/templates/auth/email/reset_password.txt.j2
+++ b/app/templates/auth/email/reset_password.txt.j2
@@ -1,6 +1,6 @@
 Dear {{ user.username }},
 
-To reset your password click on the following link:
+to reset your password click on the following link:
 
 {{ url_for('auth.reset_password', token=token, _external=True) }}
 
diff --git a/app/templates/auth/reset_password_request.html.j2 b/app/templates/auth/reset_password_request.html.j2
index ee0203f1..9145e52f 100644
--- a/app/templates/auth/reset_password_request.html.j2
+++ b/app/templates/auth/reset_password_request.html.j2
@@ -2,8 +2,7 @@
 
 {% block page_content %}
 <div class="col s12 m4">
-  <h3>Lost password?</h3>
-  <p>After entering your email address you will get an email with instruchtions about how to reset your password.</p>
+  <p>After entering your email address you will receive instructions on how to reset your password.</p>
 </div>
 
 <div class="col s12 m8">
diff --git a/app/templates/corpora/add_corpus.html.j2 b/app/templates/corpora/add_corpus.html.j2
index 413f3e6a..a93a7088 100644
--- a/app/templates/corpora/add_corpus.html.j2
+++ b/app/templates/corpora/add_corpus.html.j2
@@ -2,7 +2,6 @@
 
 {% block page_content %}
 <div class="col s12 m4">
-  <h3>...</h3>
   <p>Fill out the following form to add a corpus to your corpora.</p>
   <a class="waves-effect waves-light btn" href="{{ url_for('main.dashboard') }}"><i class="material-icons left">arrow_back</i>Back to dashboard</a>
 </div>
@@ -33,11 +32,6 @@
               {% endfor %}
             </div>
           </div>
-          <div class="row">
-            <div class="col s12">
-              <p>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren,</p>
-            </div>
-          </div>
         </div>
       </div>
       <div class="card-action right-align">
diff --git a/app/templates/main/index.html.j2 b/app/templates/main/index.html.j2
index 43a592ea..f30d120c 100644
--- a/app/templates/main/index.html.j2
+++ b/app/templates/main/index.html.j2
@@ -22,32 +22,30 @@
   <div class="row container">
     <div class="col s12 m10">
       <div class="row">
-        <div class="col s12 m4">
-          <h3>Information</h3>
-          <p>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum.</p>
+        <div class="col s12">
+          <h3>Why you should use nopaque</h3>
         </div>
 
-        <div class="col s12 m8">
-          <br class="hide-on-small-only">
+        <div class="col s12">
           <div class="row">
-            <div class="col s6 center-align">
+            <div class="col s3 center-align">
               <i class="large material-icons" style="color: #ee6e73;">flash_on</i>
               <p>Speeds up your work</p>
               <p class="light">All tools provided by nopaque are carefully selected to provide a complete tool suite without delaying compatibility issues.</p>
             </div>
-            <div class="col s6 center-align">
+            <div class="col s3 center-align">
               <i class="large material-icons" style="color: #ee6e73;">cloud</i>
               <p>Cloud infrastructure</p>
               <p class="light">All computational work is processed within nopaques cloud infrastructure. You don't need to install any software, great right?</p>
             </div>
-            <div class="col s6 center-align">
+            <div class="col s3 center-align">
               <i class="large material-icons" style="color: #ee6e73;">group</i>
-              <p>User Experience Focused</p>
+              <p>User friendly</p>
               <p class="light">By utilizing elements and principles of Material Design, we were able to create a framework that focuses on User Experience.</p>
             </div>
-            <div class="col s6 center-align">
+            <div class="col s3 center-align">
               <i class="large material-icons" style="color: #ee6e73;">settings</i>
-              <p>Easy to work with</p>
+              <p>Passt gut zum Prozess</p>
               <p class="light">We have provided detailed documentation as well as specific code examples to help new users get started.</p>
             </div>
           </div>
@@ -56,11 +54,66 @@
     </div>
     <div class="col s12 m2">
       <ul class="section table-of-contents">
-        <li><a href="#information">Information</a></li>
+        <li><a href="#information">Why you should use nopaque</a></li>
+        <li><a href="#services">What can nopaque do for you</a></li>
+        {% if current_user.is_anonymous %}
+        <li><a href="#registration-and-log-in">Registration and log in</a></li>
+        {% endif %}
+        <li><a href="#workflow">Workflow</a></li>
+      </ul>
+    </div>
+  </div>
+</div>
+
+<div class="parallax-container">
+  <div class="parallax">
+    <img src="{{ url_for('static', filename='images/chapter_book_text_tale.jpg') }}" alt="">
+  </div>
+</div>
+
+<div class="section white scrollspy" id="services">
+  <div class="row container">
+    <div class="col s12 m10">
+      <div class="row">
+        <div class="col s12">
+          <h3>What can nopaque do for you</h3>
+          <p>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum.</p>
+        </div>
+
+        <div class="col s12">
+          <br class="hide-on-small-only">
+          <div class="row">
+            <div class="col s12 m6 l3 center-align">
+              <i class="large material-icons" style="color: #ee6e73;">burst_mode</i>
+              <p>File setup</p>
+              <p class="light">Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.</p>
+            </div>
+            <div class="col s12 m6 l3 center-align">
+              <i class="large material-icons" style="color: #ee6e73;">find_in_page</i>
+              <p>Optical Character Recognition</p>
+              <p class="light">Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.</p>
+            </div>
+            <div class="col s12 m6 l3 center-align">
+              <i class="large material-icons" style="color: #ee6e73;">format_textdirection_l_to_r</i>
+              <p>Natural Language Processing</p>
+              <p class="light">Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.</p>
+            </div>
+            <div class="col s12 m6 l3 center-align">
+              <i class="large material-icons" style="color: #ee6e73;">search</i>
+              <p>Corpus analysis</p>
+              <p class="light">Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.</p>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="col s12 m2">
+      <ul class="section table-of-contents">
+        <li><a href="#information">Why you should use nopaque</a></li>
+        <li><a href="#services">What can nopaque do for you</a></li>
         {% if current_user.is_anonymous %}
         <li><a href="#registration-and-log-in">Registration and log in</a></li>
         {% endif %}
-        <li><a href="#services">Processes and Services</a></li>
         <li><a href="#workflow">Workflow</a></li>
       </ul>
     </div>
@@ -132,11 +185,11 @@
     </div>
     <div class="col s12 m2">
       <ul class="section table-of-contents">
-        <li><a href="#information">Information</a></li>
+        <li><a href="#information">Why you should use nopaque</a></li>
+        <li><a href="#services">Processes and Services</a></li>
         {% if current_user.is_anonymous %}
         <li><a href="#registration-and-log-in">Registration and log in</a></li>
         {% endif %}
-        <li><a href="#services">Processes and Services</a></li>
         <li><a href="#workflow">Workflow</a></li>
       </ul>
     </div>
@@ -144,61 +197,6 @@
 </div>
 {% endif %}
 
-<div class="parallax-container">
-  <div class="parallax">
-    <img src="{{ url_for('static', filename='images/chapter_book_text_tale.jpg') }}" alt="">
-  </div>
-</div>
-
-<div class="section white scrollspy" id="services">
-  <div class="row container">
-    <div class="col s12 m10">
-      <div class="row">
-        <div class="col s12">
-          <h3>Processes and Services</h3>
-          <p>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum.</p>
-        </div>
-
-        <div class="col s12">
-          <br class="hide-on-small-only">
-          <div class="row">
-            <div class="col s12 m6 l3 center-align">
-              <i class="large material-icons" style="color: #ee6e73;">burst_mode</i>
-              <p>File setup</p>
-              <p class="light">Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.</p>
-            </div>
-            <div class="col s12 m6 l3 center-align">
-              <i class="large material-icons" style="color: #ee6e73;">find_in_page</i>
-              <p>Optical Character Recognition</p>
-              <p class="light">Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.</p>
-            </div>
-            <div class="col s12 m6 l3 center-align">
-              <i class="large material-icons" style="color: #ee6e73;">format_textdirection_l_to_r</i>
-              <p>Natural Language Processing</p>
-              <p class="light">Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.</p>
-            </div>
-            <div class="col s12 m6 l3 center-align">
-              <i class="large material-icons" style="color: #ee6e73;">search</i>
-              <p>Corpus analysis</p>
-              <p class="light">Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.</p>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div class="col s12 m2">
-      <ul class="section table-of-contents">
-        <li><a href="#information">Information</a></li>
-        {% if current_user.is_anonymous %}
-        <li><a href="#registration-and-log-in">Registration and log in</a></li>
-        {% endif %}
-        <li><a href="#services">Processes and Services</a></li>
-        <li><a href="#workflow">Workflow</a></li>
-      </ul>
-    </div>
-  </div>
-</div>
-
 <div class="parallax-container">
   <div class="parallax">
     <img src="{{ url_for('static', filename='images/bible_text.jpg') }}" alt="">
@@ -208,21 +206,16 @@
 <div class="section white scrollspy" id="workflow">
   <div class="row container">
     <div class="col s12 m10">
-      <h3>Get things done with nopaque</h3>
-      <p>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.</p>
-      <p>Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat.</p>
-      <p>Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi.</p>
-      <p>Nam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod mazim placerat facer possim assum. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat.</p>
-      <p>Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis.</p>
-      <p>At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, At accusam aliquyam diam diam dolore dolores duo eirmod eos erat, et nonumy sed tempor et et invidunt justo labore Stet clita ea et gubergren, kasd magna no rebum. sanctus sea sed takimata ut vero voluptua. est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur</p>
+      <h3>Workflow</h3>
+      <h4>Coming soon...</h4>
     </div>
     <div class="col s12 m2">
       <ul class="section table-of-contents">
-        <li><a href="#information">Information</a></li>
+        <li><a href="#information">Why you should use nopaque</a></li>
+        <li><a href="#services">What can nopaque do for you</a></li>
         {% if current_user.is_anonymous %}
         <li><a href="#registration-and-log-in">Registration and log in</a></li>
         {% endif %}
-        <li><a href="#services">Processes and Services</a></li>
         <li><a href="#workflow">Workflow</a></li>
       </ul>
     </div>
diff --git a/app/templates/nopaque.html.j2 b/app/templates/nopaque.html.j2
index 55ad0a8f..24c0c47a 100644
--- a/app/templates/nopaque.html.j2
+++ b/app/templates/nopaque.html.j2
@@ -62,8 +62,8 @@
         <li><a href="{{ url_for('main.index') }}"><i class="material-icons">opacity</i>nopaque</a></li>
         <li><a href="#"><i class="material-icons">linear_scale</i>Workflow</a></li>
         <li><a href="{{ url_for('main.dashboard') }}"><i class="material-icons">dashboard</i>Dashboard</a></li>
-        <li><a href="{{ url_for('main.dashboard', _anchor='corpora') }}" style="padding-left: 47px;"><i class="material-icons">book</i>Corpora</a></li>
-        <li><a href="{{ url_for('main.dashboard', _anchor='jobs') }}" style="padding-left: 47px;"><i class="material-icons">work</i>Jobs</a></li>
+        <li><a href="{{ url_for('main.dashboard', _anchor='corpora') }}" style="padding-left: 47px;"><i class="material-icons">book</i>My Corpora</a></li>
+        <li><a href="{{ url_for('main.dashboard', _anchor='jobs') }}" style="padding-left: 47px;"><i class="material-icons">work</i>My Jobs</a></li>
         <li><div class="divider"></div></li>
         <li><a class="subheader">Processes and Services</a></li>
         <li><a href="{{ url_for('services.service', service='setup_files') }}"><i class="material-icons">burst_mode</i>File setup</a></li>