diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 7d683bf..6e7cc3c 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -4,6 +4,9 @@
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
+        <dependent-module archiveName="storagehub-icons-library-1.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/storagehub-icons-library/storagehub-icons-library">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
         <property name="context-root" value="workspace-widget-portlet"/>
         <property name="java-output-path" value="/workspace-widget-portlet/target/classes"/>
     </wb-module>
diff --git a/src/main/webapp/html/vre.html b/src/main/webapp/html/vre.html
deleted file mode 100644
index d12581a..0000000
--- a/src/main/webapp/html/vre.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>Bootstrap 101 Template</title>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <!-- Bootstrap -->
-    <link href="css/bootstrap.min.css" rel="stylesheet" media="screen" />
-  </head>
-  <body>
-    <script src="http://code.jquery.com/jquery.js"></script>
-    <script src="js/bootstrap.min.js"></script>
-    <!--Navigationbar-->
-<div class="container-fluid">
-  <div class="row-fluid">
-    <div class="span2">
-      <ul class="nav nav-list">
-    	<li>
-        <a class="active" href="#home">
-            <h3>Lorem VRE</h3>
-        </a>
-    	</li>
-    	<li><a href="#end_users"><h4>End Users</h4></a></li>
-    	<li><a href="#tools"><h4>Tools</h4></a></li>
-	</ul>
-
-
-	<div class="sidbarfooter"> Lorem ipsum dolors Sidebarfooter</div>
- </div>
- <div class="span10">
- <div style="padding:5px 16px;height:1000px;">
-
-    <!--Sectionlink-->
-    <a name="home"></a>
-    <!--First-Title-->
-    <h2>Lorem VRE</h2>
-    <!--First-Content-->
-    <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.</p>
-
-    <!--HTML-line-->
-    <hr>
-    <!--Sectionlink-->
-    <a name="end_users"></a>
-    <!--Second-Title-->
-    <h2>Targeted end users</h2>
-    <!--Second-Content-->
-    <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.
-    </p>
-    <!--HTML-line-->
-    <hr>
-
-    <!--Sectionlink-->
-    <a name="tools"></a>
-    <!--Tool-Section-->
-    <h2>Tools</h2>
-    <!--Tool-Section-Containing Toolcards-->
-    <div id="Toolcontainer">
-
-        <!--Toolcard-->
-        <div class="Toolcard">
-            <!--Toolcard-Title-->
-            <div class="Toolcard-header">
-                <!--Title-->
-                <h3>Lorem ipsum Tools</h3>
-
-            </div>
-
-            <!--Toolcard-Content-->
-            <div class="Toolcard-content">
-                <!--Content-->
-                <p>TLorem 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>
-
-            </div>
-            <!--Buttons-to Tool-->
-            <div class="Toolcard-menu">
-                <!--Button with Link-->
-                <div class="button" onclick="window.open('http://www.loremipsum.de/');">View</div>
-
-            </div>
-
-        </div>
-
-    </div>
-
-</div>
-    
- </div>
- </div>
-</div>
-
-
-
-  </body>
-</html>
-
diff --git a/src/main/webapp/html/workspacewidget/view.jsp b/src/main/webapp/html/workspacewidget/view.jsp
index 8d5b95e..e857659 100644
--- a/src/main/webapp/html/workspacewidget/view.jsp
+++ b/src/main/webapp/html/workspacewidget/view.jsp
@@ -13,7 +13,13 @@
 <portlet:resourceURL var="downloadFileURL">
 	<portlet:param name="fileToDownloadId" value="itemId=" />
 </portlet:resourceURL>
+<portlet:renderURL var="maximizedState"
+	windowState="<%=LiferayWindowState.MAXIMIZED.toString()%>" />
+<portlet:renderURL var="normalState"
+	windowState="<%=LiferayWindowState.NORMAL.toString()%>" />
 
+<c:set var="maximised" scope="session"
+	value="${renderRequest.getWindowState().toString().equalsIgnoreCase('maximized')}" />
 
 <table width="100%" style="border: none; border-collapse: inherit;">
 	<tr>
@@ -22,8 +28,16 @@
 			<c:when test="${currentGroup.getParentGroupId() > 0}">
 				<td><div class="ws-recents">
 						<a 	href="javascript:loadRecentItemsListIntoTable('recents', 'Recent documents');"><i
-							style="font-size: 1.2em; color: #8F8F8F;" class="material-icons">access_time</i>
-							<span>Recent</span></a>
+							style="font-size: 1.2em; color: #08c;" class="material-icons">access_time</i>
+							<span style="color: #08c;" >Recent</span></a>
+							<c:choose>
+								<c:when test="${not maximised}">
+									<a class="btn btn-link" href="${maximizedState}"><i class="material-icons">launch</i></a>
+								</c:when>
+								<c:otherwise>
+									<a class="btn btn-link" href="${normalState}"><i class="material-icons">transit_enterexit</i> Return to full page</a>
+								</c:otherwise>
+							</c:choose>
 					</div></td>
 			</c:when>
 			<c:otherwise>
@@ -33,8 +47,16 @@
 						<div id="vreFoldersDiv" class="ws-recents">
 							<a
 								href="javascript:loadItemsListIntoTable('${vreFoldersId}', 'VRE Folders', true);"><i
-								style="font-size: 1.5em; color: #8F8F8F;" class="material-icons">folder_special</i>&nbsp;
-								<span>VREs</span></a>
+								style="font-size: 1.5em; color: #08c;" class="material-icons">folder_special</i>&nbsp;
+								<span style="color: #08c;" >VREs</span></a>
+							<c:choose>
+								<c:when test="${not maximised}">
+									<a class="btn btn-link" href="${maximizedState}"><i class="material-icons">launch</i></a>
+								</c:when>
+								<c:otherwise>
+									<a class="btn btn-link" href="${normalState}"><i class="material-icons">transit_enterexit</i> Return to full page</a>
+								</c:otherwise>
+							</c:choose>
 						</div>
 					</c:if>
 				</td>
