diff --git a/server/repo/repo-ui/pom.xml b/server/repo/repo-ui/pom.xml
index b5208b58dc..87a9e66d30 100644
--- a/server/repo/repo-ui/pom.xml
+++ b/server/repo/repo-ui/pom.xml
@@ -75,11 +75,6 @@
 			<artifactId>swagger-models</artifactId>
 			<version>1.5.6</version>
 		</dependency>
-		<dependency>
-			<groupId>org.webjars</groupId>
-			<artifactId>swagger-ui</artifactId>
-			<version>2.1.4</version>
-		</dependency>
 
 		<dependency>
 			<groupId>io.springfox</groupId>
@@ -96,6 +91,26 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
+		
+		<dependency>
+			<groupId>org.webjars.bower</groupId>
+			<artifactId>angular-swagger-ui</artifactId>
+			<version>0.2.7</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.webjars.bower</groupId>
+					<artifactId>jquery</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.webjars.bower</groupId>
+					<artifactId>bootstrap-less-only</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.webjars.bower</groupId>
+					<artifactId>angular</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>		
 
 		<!-- Database -->
 
@@ -129,4 +144,4 @@
 		</plugins>
 	</build>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/server/repo/repo-ui/src/main/java/org/eclipse/vorto/repository/VortoRepository.java b/server/repo/repo-ui/src/main/java/org/eclipse/vorto/repository/VortoRepository.java
index d98d0d4be1..916d0a7829 100644
--- a/server/repo/repo-ui/src/main/java/org/eclipse/vorto/repository/VortoRepository.java
+++ b/server/repo/repo-ui/src/main/java/org/eclipse/vorto/repository/VortoRepository.java
@@ -3,12 +3,12 @@
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * and Eclipse Distribution License v1.0 which accompany this distribution.
- *   
+ *
  * The Eclipse Public License is available at
  * http://www.eclipse.org/legal/epl-v10.html
  * The Eclipse Distribution License is available at
  * http://www.eclipse.org/org/documents/edl-v10.php.
- *   
+ *
  * Contributors:
  * Bosch Software Innovations GmbH - Please refer to git log
  *******************************************************************************/
@@ -60,7 +60,7 @@
 @EnableSwagger2
 @EnableJpaRepositories
 public class VortoRepository {
-	
+
 	public static void main(String[] args) {
 		SpringApplication.run(VortoRepository.class, args);
 	}
@@ -90,9 +90,9 @@ private ApiInfo apiInfo() {
 						+ "These information models can be managed and shared within the Vorto Information Model Repository. <br/>"
 						+ " Code Generators for Information Models let you integrate devices into different platforms."
 						+ "<br/>",
-				"1.0.0", "", "", "", "");
+				"1.0.0", "", "", "EPL", "https://eclipse.org/org/documents/epl-v10.php");
 	}
-	
+
 	@Autowired
 	private UserRepository userRepository;
 
@@ -100,19 +100,19 @@ private ApiInfo apiInfo() {
 	public static PasswordEncoder encoder() {
 		return new BCryptPasswordEncoder(11);
 	}
-	
+
 	@PostConstruct
 	public void createAdminIfNotExists() throws Exception {
 		if (userRepository.findByUsername("admin") == null){
-			
+
 			User user = new User();
-			
+
 			user.setUsername("admin".toLowerCase());
 			user.setPassword( encoder().encode("!v0rt0admin"));
 			user.setHasWatchOnRepository(false);
 			user.setEmail("alexander.edelmann@bosch-si.com");
 			user.setRoles(Role.ADMIN);
-				
+
 			userRepository.save(user);
 		}
 	}
@@ -127,10 +127,10 @@ protected static class SecurityConfiguration extends WebSecurityConfigurerAdapte
 
 		@Autowired
 		private RESTAuthenticationEntryPoint authenticationEntryPoint;
-		
+
 		@Autowired
 		private PasswordEncoder passwordEncoder;
-		
+
 		@Override
 		protected void configure(HttpSecurity http) throws Exception {
 
diff --git a/server/repo/repo-ui/src/main/resources/static/css/swagger-custom.css b/server/repo/repo-ui/src/main/resources/static/css/swagger-custom.css
new file mode 100644
index 0000000000..1a1f7c95d9
--- /dev/null
+++ b/server/repo/repo-ui/src/main/resources/static/css/swagger-custom.css
@@ -0,0 +1,35 @@
+.swagger-validator {
+    display: none;
+}
+
+.swagger-section .swagger-ui-wrap {
+	font-family: Droid Sans",​sans-serif;
+ 	font: inherit;
+    line-height: 1;
+    margin-left: auto;
+    margin-right: auto;
+    max-width: 960px;
+
+}    
+ #swagger-ui-container .btn {
+    border: 0 none;
+    border-radius: 2px;
+    font-weight: bold;
+ }
+ 
+ #swagger-ui-container .btn-default{
+    background-color: #337ab7;
+    border-color: #ccc;
+    color: #333;
+ }
+ #swagger-ui-container .api-name {
+   	font-size: 25px;
+    font-weight: bold;
+    padding-bottom: 10px;
+ 
+ }
+ 
+.api-description {
+ 	font-size: 15px;
+    padding-bottom: 10px;
+ }
\ No newline at end of file
diff --git a/server/repo/repo-ui/src/main/resources/static/index.html b/server/repo/repo-ui/src/main/resources/static/index.html
index e6765a544b..c75fc9185b 100644
--- a/server/repo/repo-ui/src/main/resources/static/index.html
+++ b/server/repo/repo-ui/src/main/resources/static/index.html
@@ -17,31 +17,34 @@
     <!-- Custom styles for this template -->
     <link href="css/dashboard.css" rel="stylesheet">
     <link href="css/style.css" rel="stylesheet">
-    
+
     <!-- Font Awesome Icons -->
    	<link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.2.0/css/font-awesome.css" rel="stylesheet" type="text/css" />
 
+   	<link rel="stylesheet" href="webjars/angular-swagger-ui/0.2.7/dist/css/swagger-ui.min.css">
+
     <!-- JQuery 2.1.1-->
     <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
     <!-- Bootstrap 3.3.1 JS -->
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.1/js/bootstrap.min.js" type="text/javascript"></script>  
-	
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.1/js/bootstrap.min.js" type="text/javascript"></script>
+
 	<!-- Angular JS -->
 	<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.13/angular.min.js"></script>
 	<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.13/angular-route.min.js"></script>
 	<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.13/angular-cookies.min.js"></script>
-	
+
 	<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/angular-smart-table/2.1.6/smart-table.min.js"></script>
-	
+	<script type="text/javascript" src="webjars/angular-swagger-ui/0.2.7/dist/scripts/swagger-ui.min.js"></script>
+
     <script type="text/javascript" src="js/app.js"></script>
     <script type="text/javascript" src="js/controllers.js"></script>
     <script type="text/javascript" src="js/directives.js"></script>
-    <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/iframe-resizer/3.5.1/iframeResizer.min.js"></script> 
-    
+    <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/iframe-resizer/3.5.1/iframeResizer.min.js"></script>
+
   </head>
 
   <body>
- 
+
     <nav class="navbar navbar-inverse navbar-fixed-top">
       <div class="container-fluid">
         <div class="navbar-header">
@@ -50,7 +53,7 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
-          </button>          
+          </button>
           <a class="navbar-brand" href="./#/">Vorto Repository</a>
         </div>
         <div id="navbar" class="navbar-collapse collapse">
@@ -80,4 +83,4 @@
         </div>
     </div>
   </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/server/repo/repo-ui/src/main/resources/static/js/app.js b/server/repo/repo-ui/src/main/resources/static/js/app.js
index 3b596061be..b87e64348a 100644
--- a/server/repo/repo-ui/src/main/resources/static/js/app.js
+++ b/server/repo/repo-ui/src/main/resources/static/js/app.js
@@ -1,7 +1,7 @@
-var repository = angular.module('repository', ['ngRoute','repositoryControllers', 'repositoryDirectives', 'smart-table']);
+var repository = angular.module('repository', ['ngRoute', 'repositoryControllers', 'repositoryDirectives', 'swaggerUi', 'smart-table']);
 
 repository.config(['$routeProvider', '$httpProvider', function ($routeProvider, $httpProvider) {
-    
+
 	$routeProvider
         .when('/', {
             templateUrl: "partials/search-template.html",
@@ -30,29 +30,29 @@ repository.config(['$routeProvider', '$httpProvider', function ($routeProvider,
         .when('/login', {
             templateUrl: "partials/login-template.html",
             controller: 'AuthenticateController'
-        }) 
+        })
         .when('/signup', {
             templateUrl: "partials/signup-template.html",
             controller: 'SignUpController'
         })
         .otherwise({redirectTo: '/'});
-        
-        $httpProvider.defaults.headers.common["X-Requested-With"] = 'XMLHttpRequest';  
-	    
+
+        $httpProvider.defaults.headers.common["X-Requested-With"] = 'XMLHttpRequest';
+
 }]).run(function($location, $http, $rootScope) {
-		
+
 		// register listener to watch route changes
 	 	$rootScope.$on("$locationChangeStart", function(event, next, current) {
 
-	 		if($location.path() === "/upload" && $rootScope.authenticated === false) {	
-	 			$location.path('/login');	
+	 		if($location.path() === "/upload" && $rootScope.authenticated === false) {
+	 			$location.path('/login');
 	 		}
-	 		
-	 		if($location.path() === "/settings" && $rootScope.authenticated === false) {	
+
+	 		if($location.path() === "/settings" && $rootScope.authenticated === false) {
 	 			$location.path('/login');
 	 		}
 	    });
-	
+
 		$rootScope.user = [];
 		$rootScope.getUser = function() {
 			$http.get('./user').success(
@@ -64,11 +64,11 @@ repository.config(['$routeProvider', '$httpProvider', function ($routeProvider,
                     }
 	      		}).error(function(data, status, headers, config) {
 					$rootScope.authenticated = false;
-	    		}); 	
+	    		});
 		};
-			
+
 		$rootScope.getUser();
-			
+
 		$rootScope.logout = function() {
 			$http.post('logout', {}).success(function() {
 				$rootScope.authenticated = false;
diff --git a/server/repo/repo-ui/src/main/resources/static/js/controllers.js b/server/repo/repo-ui/src/main/resources/static/js/controllers.js
index 72700478aa..858aa840a6 100644
--- a/server/repo/repo-ui/src/main/resources/static/js/controllers.js
+++ b/server/repo/repo-ui/src/main/resources/static/js/controllers.js
@@ -1,4 +1,4 @@
-var repositoryControllers = angular.module('repositoryControllers', []);
+var repositoryControllers = angular.module('repositoryControllers', ['swaggerUi']);
 
 repositoryControllers.controller('SearchController', [ '$scope','$http', '$location', function ($scope,$http,$location) {
 
@@ -6,18 +6,18 @@ repositoryControllers.controller('SearchController', [ '$scope','$http', '$locat
   	$scope.modelType = 'all';
   	$scope.queryFilter = "";
   	$scope.fileToUpload = null;
-  	
+
   	$scope.clearInput = function() {
   		$scope.queryFilter = "";
   	};
-  	  	
+
   	$scope.searchOnEnter = function(keyEvent) {
   		if (keyEvent.keyCode === 13) {
   			$scope.search();
-  		}    		
+  		}
   	};
-  	  	
-  	$scope.search = function() {	
+
+  	$scope.search = function() {
   		var filter = null;
   		if ($scope.modelType === 'all') {
   			filter = $scope.queryFilter;
@@ -29,30 +29,30 @@ repositoryControllers.controller('SearchController', [ '$scope','$http', '$locat
 					$scope.models = data;
 	      }).error(function(data, status, headers, config) {
 					$scope.models = [];
-	    	}); 	
+	    	});
 		};
-  	
-  	$scope.search();  	
-  	
+
+  	$scope.search();
+
     $scope.displayedModels = [].concat($scope.models);
     $scope.itemsByPage 		= 15;
   	$scope.displayedPages 	= ($scope.models.length / 2);
-  	
+
   	$scope.getters= {
 		modelType: function (value) {
 			return value.id.modelType.sort();
-        }, 
+        },
         namespace: function (value) {
 	        return value.id.namespace.sort();
-        }, 
+        },
         name: function (value) {
 	        return value.id.name.sort();
-        }, 
+        },
         version: function (value) {
 	        return value.id.version.sort();
-        }        
-  	 } 	
-  	
+        }
+  	 }
+
   	$scope.go = function(model){
   		$location.path("/details/"+model.id.namespace+"/"+model.id.name+"/"+model.id.version);
   	};
@@ -60,7 +60,7 @@ repositoryControllers.controller('SearchController', [ '$scope','$http', '$locat
 
 
 repositoryControllers.controller('UploadController', ['$scope', '$rootScope', '$http','$location', function ($scope, $rootScope, $http, $location) {
-	
+
     $scope.modelFile = null;
     $scope.uploadResult = {};
 
@@ -87,7 +87,7 @@ repositoryControllers.controller('UploadController', ['$scope', '$rootScope', '$
 	    	}
 	    });
     };
-    
+
     $scope.checkin = function (handleId) {
         $http.put('./rest/secure/'+handleId)
         .success(function(result){
@@ -106,7 +106,7 @@ repositoryControllers.controller('UploadController', ['$scope', '$rootScope', '$
 	    	}
 	    });;
     };
-    
+
 }]);
 
 repositoryControllers.controller('DetailsController', ['$rootScope', '$scope', '$http','$routeParams','$location', '$route',function ($rootScope,$scope, $http,$routeParams,$location,$route) {
@@ -114,7 +114,7 @@ repositoryControllers.controller('DetailsController', ['$rootScope', '$scope', '
 	$scope.platformGeneratorMatrix = null;
 	$scope.documentationGenerators = null;
 	$scope.chosenFile = false;
-	
+
 	 $scope.uploadImage = function () {
     	var fd = new FormData();
         fd.append('file', document.getElementById('imageFile').files[0]);
@@ -141,7 +141,7 @@ repositoryControllers.controller('DetailsController', ['$rootScope', '$scope', '
 	    	}
 	    });
     };
-    
+
     $scope.hasImage = function() {
     	if (model.hasImage) {
     		return "image"
@@ -149,45 +149,45 @@ repositoryControllers.controller('DetailsController', ['$rootScope', '$scope', '
     		return "placeHolder"
     	}
     };
-	
+
 	$scope.chooseImageFile = function() {
 		document.getElementById("imageFile").click();
 	};
-	
+
     $scope.getDetails = function (namespace,name,version) {
         $http.get('./rest/model/'+namespace+'/'+name+'/'+version)
         .success(function(result){
         	$scope.model = result;
         });
     };
-    
+
     $scope.getContent = function (namespace,name,version) {
         $http.get('./rest/model/file/'+namespace+'/'+name+'/'+version)
         .success(function(result) {
         	$scope.content = result;
         });
     };
-    
+
     $scope.getPlatformGenerators = function () {
         $http.get('./rest/generation-router/platform')
         .success(function(result){
         	$scope.platformGeneratorMatrix = $scope.listToMatrix(result, 2);
         });
     };
-    
+
     $scope.getDocumentationGenerators = function () {
         $http.get('./rest/generation-router/documentation')
         .success(function(result){
         	$scope.documentationGenerators = result;
         });
     };
-    
+
   	$scope.isFilled = function(rating, value) {
   		if (rating === value) {
   			return "filled"
   		}
   	};
-    
+
     $scope.listToMatrix = function(list, n) {
 	    var grid = [], i = 0, x = list.length, col, row = -1;
 	    for (var i = 0; i < x; i++) {
@@ -199,20 +199,20 @@ repositoryControllers.controller('DetailsController', ['$rootScope', '$scope', '
 	    }
     	return grid;
 	}
-    
-    
+
+
     $scope.getDetails($routeParams.namespace,$routeParams.name,$routeParams.version);
     $scope.getContent($routeParams.namespace,$routeParams.name,$routeParams.version);
     $scope.getPlatformGenerators();
     $scope.getDocumentationGenerators();
-	
+
 	$scope.remove = function(){
 		$http.delete('./rest/model/'+$routeParams.namespace+'/'+$routeParams.name+'/'+$routeParams.version )
 		.success(function(result){
         	$location.path('/');
         }).error(function(data, status, headers, config) {
 	    	$location.path('/');
-	    });		
+	    });
 	}
 
 	/*
@@ -220,15 +220,15 @@ repositoryControllers.controller('DetailsController', ['$rootScope', '$scope', '
 	*/
 	$scope.comments = null;
 	$authority		= $rootScope.authority;
-	
+
 	$scope.getCommentsForModelId = function(){
-     
+
 		$http.get('./rest/comments/model/'+$routeParams.namespace+'/'+$routeParams.name+'/'+$routeParams.version)
 				.success(function(result){
 					$scope.comments = result;
 					$scope.comments.reverse();
 				}).error(function(data, status, headers, config) {
-				
+
 				if(status == 403){
 					$rootScope.error = "Operation is Forbidden";
 				}else if(status == 401){
@@ -242,26 +242,26 @@ repositoryControllers.controller('DetailsController', ['$rootScope', '$scope', '
 				}
 			});
 	}
-		
-	$scope.getCommentsForModelId();	
-			
+
+	$scope.getCommentsForModelId();
+
 	$scope.createComment = function(commentContent){
-		
+
 		$scope.date = new Date();
-				
+
 		var comment = {
 			"modelId"	: '/'+$routeParams.namespace+'/'+$routeParams.name+'/'+$routeParams.version,
 			"author"	: $scope.user,
 			"date"		: $scope.date,
 			"content"	: commentContent
 		}
-				
+
 		$http.post('./rest/comments', comment)
 			.success(function(result){
 				$scope.comments.reverse();
 				$scope.comments.push(comment);
 				$scope.comments.reverse();
-				
+
 			}).error(function(data, status, headers, config) {
 				if(status == 403){
 					$rootScope.error = "Operation is Forbidden";
@@ -275,52 +275,52 @@ repositoryControllers.controller('DetailsController', ['$rootScope', '$scope', '
 					$rootScope.error = "Failed Request with response status "+status;
 				}
 			});
-			
+
 		$scope.commentContent = "";
-		$scope.getCommentsForModelId();	
+		$scope.getCommentsForModelId();
 	}
-	
+
 	/*
 		Stop - Handling Comments
 	*/
-	
-	
+
+
 }]);
 
 repositoryControllers.controller('GeneratorController', [ '$scope','$http', function ($scope,$http) {
 
     $scope.generators = [];
     $scope.mostUsedGenerators = [];
-      	
-  	$scope.listGenerators = function() {	
+
+  	$scope.listGenerators = function() {
   		$http.get('./rest/generation-router/platform').success(
 	      function(data, status, headers, config) {
 					$scope.generators = data;
-	      }); 	
+	      });
 	};
-	
-	$scope.listTopUsed = function() {	
+
+	$scope.listTopUsed = function() {
   		$http.get('./rest/generation-router/topused/3').success(
 	      function(data, status, headers, config) {
 					$scope.mostUsedGenerators = data;
-	      }); 	
+	      });
 	};
-	
+
 	$scope.isFilled = function(rating, value) {
   		if (rating === value) {
   			return "filled"
   		}
   	};
-  	
+
   	$scope.listGenerators();
   	$scope.listTopUsed();
 
 } ]);
 
-repositoryControllers.controller('AuthenticateController', ['$scope', '$rootScope', '$location', '$http', 
-    
+repositoryControllers.controller('AuthenticateController', ['$scope', '$rootScope', '$location', '$http',
+
     function($scope, $rootScope, $location, $http) {
-	
+
     var authenticate = function(credentials, callback) {
 
         var headers = credentials ? {authorization : "Basic " + btoa(credentials.username + ":" + credentials.password) } : {};
@@ -357,15 +357,15 @@ repositoryControllers.controller('AuthenticateController', ['$scope', '$rootScop
 }]);
 
 /*
- * TODO -     
+ * TODO -
  */
 repositoryControllers.controller('SignUpController', [ '$location', '$scope','$http', function ($location,$scope,$http) {
-    
+
 	$scope.emailAddressExists = false;
 	$scope.usernameExists = false;
-	
+
 	$scope.go = function (path, user) {
-		
+
 		user.firstName = "";
         user.lastName = "";
         user.email = "";
@@ -373,12 +373,12 @@ repositoryControllers.controller('SignUpController', [ '$location', '$scope','$h
         user.username = "";
         user.password = "";
         user.passwordCon = "";
-		
+
         $location.path("/login");
     };
-    
+
     $scope.clear = function (user) {
-		
+
     	user.firstName = "";
         user.lastName = "";
         user.email = "";
@@ -387,11 +387,11 @@ repositoryControllers.controller('SignUpController', [ '$location', '$scope','$h
         user.password = "";
         user.passwordCon = "";
     };
-    
-    
+
+
     /*
      * checking uniqueness of username and email
-     */    
+     */
 	$scope.checkEmailAlreadyExists = function(user){
 
 		$http.post('./rest/users/unique/email', user.email , {
@@ -402,9 +402,9 @@ repositoryControllers.controller('SignUpController', [ '$location', '$scope','$h
   		      }).error(function(data, status, headers, config) {
   		      	 });
 	}
-	
+
 	$scope.usernameAlreadyExists = function(user){
-				
+
 		$http.post('./rest/users/unique/username', user.username , {
             headers: {'Content-Type': "application/json"}
         }).success(
@@ -413,41 +413,41 @@ repositoryControllers.controller('SignUpController', [ '$location', '$scope','$h
   		      }).error(function(data, status, headers, config) {
   		      	 });
 	}
-	
+
 	/*
-     * create new user 
-     */    	
-	$scope.register = function(user) {    
-        
+     * create new user
+     */
+	$scope.register = function(user) {
+
 		var userData = {
                 "firstName":user.firstName,
                 "lastName":user.lastName,
                 "email":user.email,
                 "username":user.username,
                 "password":user.password
-            };    
-            
+            };
+
             $http.post('./rest/users', userData, {
                 headers: {'Content-Type': "application/json"}
             })
             .success( function(data, status, headers, config) {
-			                   
+
             }).error(function(data, status, headers, config) {
-    	    	
-    	    });		
+
+    	    });
     }
 }]);
 
 /*
- * TODO -     
+ * TODO -
  */
 repositoryControllers.controller('SettingsController', [ '$scope','$http','$rootScope', '$location', function ($scope,$http,$rootScope,$location) {
 
 	var currentEmailAddress = "";
-	
+
 	$http.get('./rest/users/'+$rootScope.user).success(
       function(data, status, headers, config) {
-			
+
 			if(data === ""){
 				$scope.userExists = false;
 			} else {
@@ -458,14 +458,14 @@ repositoryControllers.controller('SettingsController', [ '$scope','$http','$root
 
 				$scope.userExists = true;
 			}
-			
+
       }).error(function(data, status, headers, config) {
-      	 }); 		
-	
-	$scope.updateProfil = function(user){		
+      	 });
+
+	$scope.updateProfil = function(user){
 
 		$scope.put = null;
-			
+
 		$http.put('./rest/users/'+$rootScope.user, user)
 			.then(function(response) {
 				$scope.user = response.data;
@@ -475,9 +475,9 @@ repositoryControllers.controller('SettingsController', [ '$scope','$http','$root
 					$scope.update = false;
 				}
 				$scope.put=true;
-	      }); 
+	      });
 	}
-	
+
 	$scope.checkEmailAlreadyExists = function(user){
 
 		if (currentEmailAddress === user.email) {
@@ -491,13 +491,13 @@ repositoryControllers.controller('SettingsController', [ '$scope','$http','$root
 	  		      	 });
 		}
 	}
-	
+
 }]);
 
 repositoryControllers.controller('SwaggerController', [ '$location', '$scope','$http', function ($location,$scope,$http) {
-	   		
-	$http.get('./rest/context').success(function(response) {
-    	window.passingObj = { "key" : "/"+response };
-    })
-
+	$scope.isLoading = true;
+	$scope.url = $scope.swaggerUrl = 'v2/api-docs';
+	$scope.defaultErrorHandler = function(data, status) {
+		alert('Error Loading Swagger API!');
+	};
 }]);
diff --git a/server/repo/repo-ui/src/main/resources/static/partials/rest-api-template-iframe.html b/server/repo/repo-ui/src/main/resources/static/partials/rest-api-template-iframe.html
deleted file mode 100644
index d8b7a94bf2..0000000000
--- a/server/repo/repo-ui/src/main/resources/static/partials/rest-api-template-iframe.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<link rel="icon" type="image/png" href="webjars/swagger-ui/2.1.4/images/favicon-32x32.png" sizes="32x32" />
-<link rel="icon" type="image/png" href="webjars/swagger-ui/2.1.4/images/favicon-16x16.png" sizes="16x16" />
-<link href='../webjars/swagger-ui/2.1.4/css/typography.css' media='screen' rel='stylesheet' type='text/css'/>
-<link href='../webjars/swagger-ui/2.1.4/css/reset.css' media='screen' rel='stylesheet' type='text/css'/>
-<link href='../webjars/swagger-ui/2.1.4/css/screen.css' media='screen' rel='stylesheet' type='text/css'/>
-<link href='../webjars/swagger-ui/2.1.4/css/reset.css' media='print' rel='stylesheet' type='text/css'/>
-<link href='../webjars/swagger-ui/2.1.4/css/print.css' media='print' rel='stylesheet' type='text/css'/>
-<script src='../webjars/swagger-ui/2.1.4/lib/jquery-1.8.0.min.js' type='text/javascript'></script>
-<script src='../webjars/swagger-ui/2.1.4/lib/jquery.slideto.min.js' type='text/javascript'></script>
-<script src='../webjars/swagger-ui/2.1.4/lib/jquery.wiggle.min.js' type='text/javascript'></script>
-<script src='../webjars/swagger-ui/2.1.4/lib/jquery.ba-bbq.min.js' type='text/javascript'></script>
-<script src='../webjars/swagger-ui/2.1.4/lib/handlebars-2.0.0.js' type='text/javascript'></script>
-<script src='../webjars/swagger-ui/2.1.4/lib/underscore-min.js' type='text/javascript'></script>
-<script src='../webjars/swagger-ui/2.1.4/lib/backbone-min.js' type='text/javascript'></script>
-<script src='../webjars/swagger-ui/2.1.4/swagger-ui.js' type='text/javascript'></script>
-<script src='../webjars/swagger-ui/2.1.4/lib/highlight.7.3.pack.js' type='text/javascript'></script>
-<script src='../webjars/swagger-ui/2.1.4/lib/jsoneditor.min.js' type='text/javascript'></script>
-<script src='../webjars/swagger-ui/2.1.4/lib/marked.js' type='text/javascript'></script>
-
-
-<div class="swagger-section">
-   
-    <script>    
-	    var swaggerUi = new SwaggerUi({
-		  url: window.parent.passingObj["key"]+"/v2/api-docs",
-		  dom_id:"swagger-ui-container"
-		});
-		
-		swaggerUi.load();
-	</script>
-	
-	<div id="message-bar" class="swagger-ui-wrap" data-sw-translate>&nbsp;</div>
-	<div id="swagger-ui-container" class="swagger-ui-wrap"></div>
-	
-</div>
diff --git a/server/repo/repo-ui/src/main/resources/static/partials/rest-api-template.html b/server/repo/repo-ui/src/main/resources/static/partials/rest-api-template.html
index 8597c4fba1..65cd262f2e 100644
--- a/server/repo/repo-ui/src/main/resources/static/partials/rest-api-template.html
+++ b/server/repo/repo-ui/src/main/resources/static/partials/rest-api-template.html
@@ -1,11 +1,10 @@
-
-<div>
-   
-     <iframe style="width: 100%; border: 0px; height:1000px;" src="partials/rest-api-template-iframe.html" scrolling="no"></iframe>
-     <script>
-            iFrameResize({
-                   log : false,
-                   checkOrigin : false
-            })
-     </script>
-</div>
+<link href='css/swagger_custom.css' media='screen' rel='stylesheet' type='text/css'/>
+<div class="swagger-section">
+<div id="message-bar" class="swagger-ui-wrap" data-sw-translate>&nbsp;</div>
+	<div id="swagger-ui-container" class="swagger-ui-wrap">
+	    <h3 ng-show="isLoading">Loading... Please wait...</h3>
+	    <div swagger-ui url="swaggerUrl" loading="isLoading" parser="json" api-explorer="true" trusted-sources="true"
+	         error-handler="defaultErrorHandler">
+	    </div>
+	</div>
+</div>
\ No newline at end of file