diff --git a/src/main/webapp/WEB-INF/jsp/admin/layout.jsp b/src/main/webapp/WEB-INF/jsp/admin/layout.jsp
index 3e7dd6453..d89b6a7a2 100644
--- a/src/main/webapp/WEB-INF/jsp/admin/layout.jsp
+++ b/src/main/webapp/WEB-INF/jsp/admin/layout.jsp
@@ -98,14 +98,14 @@
                             <li><a href="<spring:url value='/contributor/edit-name' />"><i class="material-icons left">mode_edit</i><fmt:message key="edit.name" /></a></li>
                             <%--<li class="divider"></li>
                             <li><a href="<spring:url value='/content/contributor/edit-email' />"><i class="material-icons left">mail</i><fmt:message key="edit.email" /></a></li>--%>
-                            <sec:authorize access="hasRole('ROLE_ADMIN')">
+                            <c:if test="${fn:contains(contributor.roles, 'ADMIN')}">
                                 <li class="divider"></li>
                                 <li><a href="<spring:url value='/admin' />"><i class="material-icons left">build</i><fmt:message key="administration" /></a></li>
-                            </sec:authorize>
-                            <sec:authorize access="hasRole('ROLE_ANALYST')">
+                            </c:if>
+                            <c:if test="${fn:contains(contributor.roles, 'ANALYST')}">
                                 <li class="divider"></li>
                                 <li><a href="<spring:url value='/analytics' />"><i class="material-icons left">timeline</i><fmt:message key="analytics" /></a></li>
-                            </sec:authorize>
+                            </c:if>
                             <li class="divider"></li>
                             <li><a id="logout" href="<spring:url value='/logout' />"><i class="material-icons left">power_settings_new</i><fmt:message key="sign.out" /></a></li>
                         </ul>
diff --git a/src/main/webapp/WEB-INF/jsp/content/layout.jsp b/src/main/webapp/WEB-INF/jsp/content/layout.jsp
index 7b821d873..d621b8c56 100644
--- a/src/main/webapp/WEB-INF/jsp/content/layout.jsp
+++ b/src/main/webapp/WEB-INF/jsp/content/layout.jsp
@@ -204,14 +204,14 @@
                             <li><a href="<spring:url value='/content/contributor/edit-name' />"><i class="material-icons left">mode_edit</i><fmt:message key="edit.name" /></a></li>
                             <%--<li class="divider"></li>
                             <li><a href="<spring:url value='/content/contributor/edit-email' />"><i class="material-icons left">mail</i><fmt:message key="edit.email" /></a></li>--%>
-                            <sec:authorize access="hasRole('ROLE_ADMIN')">
+                            <c:if test="${fn:contains(contributor.roles, 'ADMIN')}">
                                 <li class="divider"></li>
                                 <li><a href="<spring:url value='/admin' />"><i class="material-icons left">build</i><fmt:message key="administration" /></a></li>
-                            </sec:authorize>
-                            <sec:authorize access="hasRole('ROLE_ANALYST')">
+                            </c:if>
+                            <c:if test="${fn:contains(contributor.roles, 'ANALYST')}">
                                 <li class="divider"></li>
                                 <li><a href="<spring:url value='/analytics' />"><i class="material-icons left">timeline</i><fmt:message key="analytics" /></a></li>
-                            </sec:authorize>
+                            </c:if>
                             <li class="divider"></li>
                             <li><a  id="logout" href="<spring:url value='/logout' />"><i class="material-icons left">power_settings_new</i><fmt:message key="sign.out" /></a></li>
                         </ul>
diff --git a/src/main/webapp/WEB-INF/jsp/content/multimedia/image/edit.jsp b/src/main/webapp/WEB-INF/jsp/content/multimedia/image/edit.jsp
index 0c3d79c50..fc3b61083 100644
--- a/src/main/webapp/WEB-INF/jsp/content/multimedia/image/edit.jsp
+++ b/src/main/webapp/WEB-INF/jsp/content/multimedia/image/edit.jsp
@@ -95,9 +95,9 @@
             <button id="submitButton" class="btn-large waves-effect waves-light" type="submit">
                 <fmt:message key="edit" /> <i class="material-icons right">send</i>
             </button>
-            <sec:authorize access="hasRole('ROLE_EDITOR')">
+            <c:if test="${fn:contains(contributor.roles, 'EDITOR')}">
                 <a href="<spring:url value='/content/multimedia/image/delete/${image.id}' />" class="waves-effect waves-red red-text btn-flat right"><fmt:message key="delete" /></a>
-            </sec:authorize>
+            </c:if>
         </form:form>
     </div>
     
diff --git a/src/main/webapp/WEB-INF/jsp/content/storybook/edit.jsp b/src/main/webapp/WEB-INF/jsp/content/storybook/edit.jsp
index e31232e17..3a585a125 100644
--- a/src/main/webapp/WEB-INF/jsp/content/storybook/edit.jsp
+++ b/src/main/webapp/WEB-INF/jsp/content/storybook/edit.jsp
@@ -96,9 +96,9 @@
     
     <c:forEach var="storyBookChapter" items="${storyBookChapters}" varStatus="status">
         <a name="ch-id-${storyBookChapter.id}"></a>
-        <sec:authorize access="hasRole('ROLE_EDITOR')">
+        <c:if test="${fn:contains(contributor.roles, 'EDITOR')}">
             <a class="storyBookChapterDeleteLink right red-text" style="margin-top: 1em;" href="<spring:url value='/content/storybook/edit/${storyBook.id}/chapter/delete/${storyBookChapter.id}' />"><i class="material-icons" title="<fmt:message key='delete' />">delete</i></a>
-        </sec:authorize>
+        </c:if>
         <h5 style="margin-top: 1em;" class="grey-text"><fmt:message key="chapter" />&nbsp;${storyBookChapter.sortOrder + 1}/${fn:length(storyBookChapters)}</h5>
         <div class="card-panel storyBookChapter">
             <c:if test="${not empty storyBookChapter.image}">
diff --git a/src/main/webapp/WEB-INF/jsp/content/storybook/paragraph/edit.jsp b/src/main/webapp/WEB-INF/jsp/content/storybook/paragraph/edit.jsp
index 95871b22e..f5d69749c 100644
--- a/src/main/webapp/WEB-INF/jsp/content/storybook/paragraph/edit.jsp
+++ b/src/main/webapp/WEB-INF/jsp/content/storybook/paragraph/edit.jsp
@@ -31,9 +31,9 @@
             <button id="submitButton" class="btn-large waves-effect waves-light" type="submit">
                 <fmt:message key="edit" /> <i class="material-icons right">send</i>
             </button>
-            <sec:authorize access="hasRole('ROLE_EDITOR')">
+            <c:if test="${fn:contains(contributor.roles, 'EDITOR')}">
                 <a href="<spring:url value='/content/storybook/paragraph/delete/${storyBookParagraph.id}' />" class="waves-effect waves-red red-text btn-flat right"><fmt:message key="delete" /></a>
-            </sec:authorize>
+            </c:if>
         </form:form>
     </div>
 </content:section>
diff --git a/src/main/webapp/WEB-INF/jsp/content/word/edit.jsp b/src/main/webapp/WEB-INF/jsp/content/word/edit.jsp
index dd9012643..1474f0b68 100644
--- a/src/main/webapp/WEB-INF/jsp/content/word/edit.jsp
+++ b/src/main/webapp/WEB-INF/jsp/content/word/edit.jsp
@@ -166,9 +166,9 @@
             <button id="submitButton" class="btn-large waves-effect waves-light" type="submit">
                 <fmt:message key="edit" /> <i class="material-icons right">send</i>
             </button>
-            <sec:authorize access="hasRole('ROLE_EDITOR')">
+            <c:if test="${fn:contains(contributor.roles, 'EDITOR')}">
                 <a href="<spring:url value='/content/word/delete/${word.id}' />" class="waves-effect waves-red red-text btn-flat right"><fmt:message key="delete" /></a>
-            </sec:authorize>
+            </c:if>
         </form:form>
     </div>
     
diff --git a/src/main/webapp/WEB-INF/jsp/layout.jsp b/src/main/webapp/WEB-INF/jsp/layout.jsp
index bd380894e..8a6814d09 100644
--- a/src/main/webapp/WEB-INF/jsp/layout.jsp
+++ b/src/main/webapp/WEB-INF/jsp/layout.jsp
@@ -59,7 +59,7 @@
                         <a id="logo-container" href="<spring:url value='/' />" class="brand-logo">
                             <img src="<spring:url value='/static/img/logo-text-256x77.png' />" alt="elimu.ai" />
                         </a>
-                        <sec:authorize access="!hasAnyRole('ROLE_ADMIN','ROLE_CONTRIBUTOR')">
+                        <c:if test="${empty contributor}">
                             <ul class="right hide-on-med-and-down">
                                 <li><a href="<spring:url value='/sign-on' />"><fmt:message key="sign.on" /></a></li>
                             </ul>
@@ -111,8 +111,8 @@
                                 </c:choose>
                                 <li><a class="btn signOnBtn" href="<spring:url value='/sign-on' />"><fmt:message key="sign.on" /></a></li>
                             </ul>
-                        </sec:authorize>
-                        <sec:authorize access="hasAnyRole('ROLE_ADMIN','ROLE_CONTRIBUTOR')">
+                        </c:if>
+                        <c:if test="${not empty contributor}">
                             <ul id="nav-mobile" class="side-nav">
                                 <li>
                                     <a class="btn tokenButtonSideNav" href="<spring:url value='/sign-on/web3' />">
@@ -157,7 +157,7 @@
                                     </div>
                                 </a>
                             </ul>
-                        </sec:authorize>
+                        </c:if>
                         
                         <ul class="right">
                             <script>