diff --git a/src/js/pe-ap.js b/src/js/pe-ap.js
index d0b17f17e9e..8f27745df9a 100644
--- a/src/js/pe-ap.js
+++ b/src/js/pe-ap.js
@@ -958,12 +958,15 @@
 					listView = '<ul data-role="listview" data-theme="' + theme2 + '">',
 					listItems,
 					listItem,
+					listItem2,
 					sectionOpen = '<div data-theme="' + theme1 + '"' + ' class="wb-nested-menu',
 					sectionLink = '<a data-role="button" data-theme="' + theme1 + '" data-icon="arrow-d" data-iconpos="left" data-corners="false" href="',
 					sectionLinkOpen = '">' + headingOpen + sectionLink,
 					sectionLinkClose = '</a>' + headingClose,
 					link = '<a data-role="button" data-icon="arrow-r" data-iconpos="right" data-corners="false" href="',
-					menu;
+					menu,
+					i,
+					len;
 				collapseTopOnly = (collapseTopOnly !== undefined ? collapseTopOnly : true);
 				collapsible = (collapsible !== undefined ? collapsible : false);
 				returnString = (returnString !== undefined ? returnString : false);
@@ -1006,19 +1009,28 @@
 								nextDOM = next[0];
 								if (nextDOM.tagName.toLowerCase() === 'ul') {
 									menu += listView;
-									nested = next.find('li ul');
-									if (nested.length !== 0) { // Special handling for a nested list
+									nested = nextDOM.querySelector('li ul');
+									if (nested !== null && nested.length !== 0) { // Special handling for a nested list
 										hnestTag = 'h' + (hlevel + 1);
-										hnestDOM = nested[0];
-										hnestLinkDOM = nested.prev('a')[0];
-										menu += sectionOpen + '"><' + hnestTag + ' class="wb-nested-li-heading">' + sectionLink + hnestLinkDOM.href + '">' + hnestLinkDOM.innerHTML + '</a></' + hnestTag + '>' + listView;
-										listItems = hnestDOM.getElementsByTagName('li');
-										for (nested_i = 0, nested_len = listItems.length; nested_i !== nested_len; nested_i += 1) {
-											listItem = listItems[nested_i];
-											hlinkDOM = listItem.getElementsByTagName('a')[0];
-											menu += '<li data-corners="false" data-shadow="false" data-iconshadow="true" data-icon="arrow-r" data-iconpos="right"><a href="' + hlinkDOM.href + '">' + hlinkDOM.innerHTML + '</a></li>';
+										listItems = nextDOM.children;
+										for (i = 0, len = listItems.length; i !== len; i += 1) {
+											listItem = listItems[i];
+											hnestDOM = listItem.getElementsByTagName('li');
+											menu += '<li>';
+											if (hnestDOM.length !== 0) {
+												hnestLinkDOM = listItem.children[0];
+												menu += sectionOpen + '"><' + hnestTag + ' class="wb-nested-li-heading">' + sectionLink + hnestLinkDOM.href + '">' + hnestLinkDOM.innerHTML + '</a></' + hnestTag + '>' + listView;
+												for (nested_i = 0, nested_len = hnestDOM.length; nested_i !== nested_len; nested_i += 1) {
+													listItem2 = hnestDOM[nested_i];
+													hlinkDOM = listItem2.querySelector('a');
+													menu += '<li data-corners="false" data-shadow="false" data-iconshadow="true" data-icon="arrow-r" data-iconpos="right"><a href="' + hlinkDOM.href + '">' + hlinkDOM.innerHTML + '</a></li>';
+												}
+												menu += '</ul></div>';
+											} else {
+												menu += listItem.innerHTML;
+											}
+											menu += '</li>';
 										}
-										menu += '</ul></div>';
 									} else {
 										menu += nextDOM.innerHTML;
 									}
diff --git a/src/theme-base/sass/includes/_default-mobile.scss b/src/theme-base/sass/includes/_default-mobile.scss
index c588bb2148f..b4523c3a1d9 100644
--- a/src/theme-base/sass/includes/_default-mobile.scss
+++ b/src/theme-base/sass/includes/_default-mobile.scss
@@ -143,6 +143,13 @@ table {
 [class*="span-"]{
 	position: relative;
 }
+	
+#wb-main-in {
+	padding: 0 3px;
+	h1 {
+		margin-top: 0.5em;
+	}
+}
 
 .clear {
 	clear: both;
@@ -585,6 +592,11 @@ select {
 		border-left: none;
 		border-right: none;
 		background: #F4F4F4;
+		.wb-nested-menu {
+			a {
+				font-size: 0.8em;
+			}
+		}
 	}
 	.ui-btn {
 		margin: 0;
diff --git a/src/theme-gcwu-fegc/sass/includes/_default-mobile.scss b/src/theme-gcwu-fegc/sass/includes/_default-mobile.scss
index 759ba049b71..41708a646b7 100644
--- a/src/theme-gcwu-fegc/sass/includes/_default-mobile.scss
+++ b/src/theme-gcwu-fegc/sass/includes/_default-mobile.scss
@@ -164,6 +164,13 @@ table {
 	position: relative;
 }
 
+#wb-main-in {
+	padding: 0 3px;
+	h1 {
+		margin-top: 0.5em;
+	}
+}
+
 .clear {
 	clear: both;
 	@extend %gcwu-default-mobile-display-block;
@@ -568,6 +575,11 @@ select {
 		border-left: none;
 		border-right: none;
 		background: #F4F4F4;
+		.wb-nested-menu {
+			a {
+				font-size: 0.8em;
+			}
+		}
 	}
 	.ui-btn {
 		margin: 0;
diff --git a/src/theme-wet-boew/sass/includes/_default-mobile.scss b/src/theme-wet-boew/sass/includes/_default-mobile.scss
index 2eed8901d42..9be1c47882c 100644
--- a/src/theme-wet-boew/sass/includes/_default-mobile.scss
+++ b/src/theme-wet-boew/sass/includes/_default-mobile.scss
@@ -143,6 +143,13 @@ table {
 	position: relative;
 }
 
+#wb-main-in {
+	padding: 0 3px;
+	h1 {
+		margin-top: 0.5em;
+	}
+}
+
 .clear {
 	clear: both;
 	@extend %wet-default-mobile-display-block;
@@ -597,6 +604,11 @@ select {
 		border-left: none;
 		border-right: none;
 		background: #F4F4F4;
+		.wb-nested-menu {
+			a {
+				font-size: 0.8em;
+			}
+		}
 	}
 	.ui-btn {
 		margin: 0;