diff --git a/administrator/templates/isis/css/template-rtl.css b/administrator/templates/isis/css/template-rtl.css
index d70e93e..3c69e36 100644
--- a/administrator/templates/isis/css/template-rtl.css
+++ b/administrator/templates/isis/css/template-rtl.css
@@ -7353,6 +7353,7 @@ html[dir=rtl] .quick-icons .nav-list [class*=" icon-"] {
 }
 .container-main,
 #system-debug {
+	width: 98.3% !important;
 	padding-bottom: 50px;
 }
 #status {
@@ -8018,6 +8019,8 @@ a.grid_true {
 }
 .j-sidebar-container.j-sidebar-hidden {
 	left: -16.5%;
+	position: absolute;
+	margin: -10px 0 0 -1px;
 }
 .j-sidebar-container.j-sidebar-visible {
 	left: 0;
@@ -8066,6 +8069,9 @@ a.grid_true {
 #system-debug.j-toggle-main {
 	float: right;
 }
+.j-toggle-main.expanded {
+	width: 100%;
+}
 @media (min-width: 768px) {
 	.j-toggle-transition {
 		-webkit-transition: all 0.3s ease;
diff --git a/administrator/templates/isis/css/template.css b/administrator/templates/isis/css/template.css
index 05afa9a..3883dae 100644
--- a/administrator/templates/isis/css/template.css
+++ b/administrator/templates/isis/css/template.css
@@ -7353,6 +7353,7 @@ html[dir=rtl] .quick-icons .nav-list [class*=" icon-"] {
 }
 .container-main,
 #system-debug {
+	width: 98.3% !important;
 	padding-bottom: 50px;
 }
 #status {
@@ -8018,6 +8019,8 @@ a.grid_true {
 }
 .j-sidebar-container.j-sidebar-hidden {
 	left: -16.5%;
+	position: absolute;
+	margin: -10px 0 0 -1px;
 }
 .j-sidebar-container.j-sidebar-visible {
 	left: 0;
@@ -8066,6 +8069,9 @@ a.grid_true {
 #system-debug.j-toggle-main {
 	float: right;
 }
+.j-toggle-main.expanded {
+	width: 100%;
+}
 @media (min-width: 768px) {
 	.j-toggle-transition {
 		-webkit-transition: all 0.3s ease;
diff --git a/administrator/templates/isis/less/template.less b/administrator/templates/isis/less/template.less
index 247934e..ab0bce6 100644
--- a/administrator/templates/isis/less/template.less
+++ b/administrator/templates/isis/less/template.less
@@ -443,6 +443,7 @@ html[dir=rtl] .quick-icons .nav-list [class^="icon-"],html[dir=rtl] .quick-icons
 /* Main Container & System Debug Padding */
 .container-main,
 #system-debug {
+	width: 98.3% !important;
 	padding-bottom: 50px;
 }

@@ -1083,6 +1084,8 @@ a.grid_true {
 }
 .j-sidebar-container.j-sidebar-hidden {
 	left: -16.5%;
+    position: absolute;
+    margin: -10px 0 0 -1px;
 }
 .j-sidebar-container.j-sidebar-visible {
 	left: 0;
@@ -1131,6 +1134,11 @@ a.grid_true {
 #system-debug.j-toggle-main {
 	float: right;
 }
+
+/* For transition effect */
+.j-toggle-main.expanded {
+	width: 100%;
+}
 @media (min-width: 768px) {
 	.j-toggle-transition {
 		-webkit-transition: all 0.3s ease;