diff --git a/src/main/webapp/app/layouts/main/main.component.html b/src/main/webapp/app/layouts/main/main.component.html
index 4a8312c44dee3ed184d52a21f737551c9c8f8183..2753f85cbf82512a23963d5053827a7d1e0d7bf1 100644
--- a/src/main/webapp/app/layouts/main/main.component.html
+++ b/src/main/webapp/app/layouts/main/main.component.html
@@ -1,205 +1,29 @@
 <!-- codeability bar -->
 <div id="top-space">
-    <img src="/content/img/logo-top.png" alt="codeAbility" width="168px">
+	<img src="/content/img/logo-top.png" alt="codeAbility" width="168px">
 </div>
 
 <div>
-    <router-outlet name="navbar"></router-outlet>
+	<router-outlet name="navbar"></router-outlet>
 </div>
 <div class="myBar"></div>
 
 
 <div class="container-fluid">
-    <div class="card jh-card">
-        <router-outlet></router-outlet>
-    </div>
+	<div class="card jh-card">
+		<router-outlet></router-outlet>
+	</div>
 
-    <jhi-footer></jhi-footer>
-    
-    <div class="pagewrapper">
+	<jhi-footer></jhi-footer>
 
+	<div class="pagewrapper">
 
 
-<!-- Main content -->
-<div class="container-fluid">
-    <h1 align="center" style="padding: 50px 0px 15px 0px;">Browse our popular content</h1>
-    <h4 align="center" style="margin-bottom: 50px">An optional subheadline for additional information</h4>
-    <div class="row">
-        <div class="col-sm-3">
-            <p style="padding-left: 30px;"><strong>Computer Science</strong></p>
-            <ul style="list-style-type: circle;">
-                <li><a href="#">Azure</a></li>
-                <li><a href="#">Blockchain</a></li>
-                <li><a href="#">C Programing</a></li>
-                <li><a href="#">Devops</a></li>
-                <li><a href="#">Django</a></li>
-                <li><a href="#">Full Stack Developement</a></li>
-                <li><a href="#">HTML 5</a></li>
-                <li><a href="#">Java</a></li>
-                <li><a href="#">JavaScript</a></li>
-                <li><a href="#">Python</a></li>
-                </ul>   
-        </div>
-
-        <div class="col-sm-3">
-            <p style="padding-left: 30px;"><strong>Data Science</strong></p>
-            <ul style="list-style-type: circle;">
-                <li><a href="#">Artifical Intelligence</a></li>
-                <li><a href="#">Big Data</a></li>
-                <li><a href="#">Cloud Computing</a></li>
-                <li><a href="#">Computer Programing</a></li>
-                <li><a href="#">Data Analysis</a></li>
-                <li><a href="#">Data Mining</a></li>
-                <li><a href="#">Mashine Learning</a></li>
-                <li><a href="#">Power BI</a></li>
-                <li><a href="#">Python</a></li>
-                <li><a href="#">Quantum Computing</a></li>
-                </ul>
-        </div>
-
-        <div class="col-sm-3">
-            <p style="padding-left: 30px;"><strong>Engineering</strong></p>
-            <ul style="list-style-type: circle;">
-                <li><a href="#">Aerospace Engineering</a></li>
-                <li><a href="#">Biomedical Engineering</a></li>
-                <li><a href="#">Chemical Engineering</a></li>
-                <li><a href="#">Civil Engineering</a></li>
-                <li><a href="#">Computer Engineering</a></li>
-                <li><a href="#">Electrical Engineering</a></li>
-                <li><a href="#">Industrial Engineering</a></li>
-                <li><a href="#">Mechanical Engineering</a></li>
-                <li><a href="#">Software Engineering</a></li>
-                <li><a href="#">Structural Engineering</a></li>
-                </ul>
-        </div>
-
-        <div class="col-sm-3">
-            <p style="padding-left: 30px;"><strong>Buisness</strong></p>
-            <ul style="list-style-type: circle;">
-                <li><a href="#">Buisness Administration</a></li>
-                <li><a href="#">Buisness Analysis</a></li>
-                <li><a href="#">Corporate Finance</a></li>
-                <li><a href="#">Economics</a></li>
-                <li><a href="#">Entrepreneurship</a></li>
-                <li><a href="#">Finance</a></li>
-                <li><a href="#">Financial Literacy</a></li>
-                <li><a href="#">Leadership</a></li>
-                <li><a href="#">Project Management</a></li>
-                <li><a href="#">Statistics</a></li>
-                </ul>    
-        </div>
-    </div>
-
-    <div class="row">
-        <div class="col-sm-3">
-            <p style="padding-left: 30px;"><strong>Computer Science</strong></p>
-            <ul style="list-style-type: circle;">
-                <li><a href="#">Azure</a></li>
-                <li><a href="#">Blockchain</a></li>
-                <li><a href="#">C Programing</a></li>
-                <li><a href="#">Devops</a></li>
-                <li><a href="#">Django</a></li>
-                <li><a href="#">Full Stack Developement</a></li>
-                <li><a href="#">HTML 5</a></li>
-                <li><a href="cards-modal.html">Java</a></li>
-                <li><a href="#">JavaScript</a></li>
-                <li><a href="#">Python</a></li>
-                </ul>   
-        </div>
-
-        <div class="col-sm-3">
-            <p style="padding-left: 30px;"><strong>Data Science</strong></p>
-            <ul style="list-style-type: circle;">
-                <li><a href="#">Artifical Intelligence</a></li>
-                <li><a href="#">Big Data</a></li>
-                <li><a href="#">Cloud Computing</a></li>
-                <li><a href="#">Computer Programing</a></li>
-                <li><a href="#">Data Analysis</a></li>
-                <li><a href="#">Data Mining</a></li>
-                <li><a href="#">Mashine Learning</a></li>
-                <li><a href="#">Power BI</a></li>
-                <li><a href="#">Python</a></li>
-                <li><a href="#">Quantum Computing</a></li>
-                </ul>
-        </div>
-
-        <div class="col-sm-3">
-            <p style="padding-left: 30px;"><strong>Engineering</strong></p>
-            <ul style="list-style-type: circle;">
-                <li><a href="#">Aerospace Engineering</a></li>
-                <li><a href="#">Biomedical Engineering</a></li>
-                <li><a href="#">Chemical Engineering</a></li>
-                <li><a href="#">Civil Engineering</a></li>
-                <li><a href="#">Computer Engineering</a></li>
-                <li><a href="#">Electrical Engineering</a></li>
-                <li><a href="#">Industrial Engineering</a></li>
-                <li><a href="#">Mechanical Engineering</a></li>
-                <li><a href="#">Software Engineering</a></li>
-                <li><a href="#">Structural Engineering</a></li>
-                </ul>
-        </div>
-
-        <div class="col-sm-3">
-            <p style="padding-left: 30px;"><strong>Buisness</strong></p>
-            <ul style="list-style-type: circle;">
-                <li><a href="#">Buisness Administration</a></li>
-                <li><a href="#">Buisness Analysis</a></li>
-                <li><a href="#">Corporate Finance</a></li>
-                <li><a href="#">Economics</a></li>
-                <li><a href="#">Entrepreneurship</a></li>
-                <li><a href="#">Finance</a></li>
-                <li><a href="#">Financial Literacy</a></li>
-                <li><a href="#">Leadership</a></li>
-                <li><a href="#">Project Management</a></li>
-                <li><a href="#">Statistics</a></li>
-                </ul>    
-        </div>
-    </div>
-
 
-<!-- FULL CONTENT END-->
-</div> <!-- main content end-->
+		<!-- Main content -->
 
-<!-- Footer -->
-  <div class="footer">
-    <div class="container-fluid">      
-      <div class="row">
-        <div class="col-4">
-          <div class="logo-container">
-            <img style="padding-left: 25px; padding-top: 15px; float: left;" src="/content/img/logo-footer.png" width="128" height="auto"/>
-          </div>        
-        </div>
-        <div class="col-8">          
-          <div style="float: left; padding-top: 15px;">
-            <ul>
-              <li><a href="#">About codeAbility</a></li>
-            </ul>
-          </div>
-          <div style="float: left; padding-top: 15px;">
-            <ul>
-              <li><a href="#">About this platform</a></li>
-            </ul>
-          </div>
-          <div style="float: left; padding-top: 15px;">
-            <ul>
-              <li><a href="#">Disclaimer</a></li>
-            </ul>
-          </div>
-          <div style="float: left; padding-top: 15px;">
-            <ul>
-              <li><a href="#">Imprint</a></li>
-            </ul>
-          </div>
-          <div style="float: left; padding-top: 15px;">
-            <ul>
-              <li><a href="#">Privacy</a></li>
-            </ul>
-          </div>
-      </div>        
-    </div>     
-  </div>
-  </div>
 
-</div> <!-- Wrapper End-->
-<jhi-page-ribbon></jhi-page-ribbon>
+	</div>
+	<!-- Wrapper End-->
+	<jhi-page-ribbon></jhi-page-ribbon>
 </div>
diff --git a/src/main/webapp/app/layouts/navbar/navbar.component.html b/src/main/webapp/app/layouts/navbar/navbar.component.html
index 16d64d25188ca35222ba20ecb4445dbb93dc225f..b13c837e0c5874e5a023ddfee82d5047161aa4d8 100644
--- a/src/main/webapp/app/layouts/navbar/navbar.component.html
+++ b/src/main/webapp/app/layouts/navbar/navbar.component.html
@@ -114,19 +114,16 @@
                <!-- Icon End -->
                   <span jhiTranslate="global.menu.search">Search</span></a>TODO
                     <div class="dropdown-menu">
-                        <div class="search-container">
+                        <div class="search-container dropdown-item">
                         <!-- Quick Search -->    
-                        <form>
                             <h3 style="color: #b3b3b3;">Search</h3>
                           <p style="color: #39a6ff;">Search courses and programs</p>
-                          <p style="color: #b3b3b3;">Some text to descripte the search functions and<br>additional informations. And some more text<br>for a second line</p>
+                          <p style="color: #b3b3b3;">Some text to describe the search functions and<br>additional informations. And some more text<br>for a second line</p>
                             <div class="input-group mb-3">
                               <input type="text" class="form-control" id="search-placeholder" placeholder="Search">
                             </div>
-                          </form>
 
                           <!-- Filter options -->    
-                          <form action="/action_page.php">
                             <div class="form-group">
                               <label for="filter-options">Filter</label>
                               <select class="form-control" id="university" name="university-list">
@@ -137,9 +134,7 @@
                                 <option>Wien</option>
                               </select>
                               </div>
-                          </form>
 
-                          <form action="/action_page.php">
                             <div class="form-group">
                               <select class="form-control" id="repository" name="repository-list">
                                 <option value="" disabled selected>Select repository</option>
@@ -149,9 +144,7 @@
                                 <option>Repository 4</option>
                               </select>
                               </div>
-                          </form>                        
                           
-                          <form action="/action_page.php">
                             <div class="form-group">
                               <select class="form-control" id="file-format" name="file-format">
                                 <option value="" disabled selected style="color: #b3b3b3;">Select file format</option>
@@ -161,10 +154,8 @@
                                 <option>Wien</option>
                               </select>
                               </div>
-                          </form>
 
                           <!-- Status options -->   
-                          <form action="/action_page.php">
                             <div class="form-group">
                               <label for="status">Status</label>
                               <select class="form-control" id="status" name="sellist1">
@@ -172,10 +163,8 @@
                                 <option>Option 2</option>
                               </select>
                               </div>
-                          </form>
 
                           <!-- difficulty options --> 
-                          <form action="/action_page.php">
                             <div class="form-group">
                               <label for="difficulty">Difficulty</label>
                               <select class="form-control" id="difficulty" name="sellist1">
@@ -185,7 +174,6 @@
                                 <option>Insane</option>
                               </select>
                               </div>
-                          </form>
 
                         </div>
                     </div>