diff --git a/theme/standard/footer.html b/theme/standard/footer.html
index 7c26653224f..c016bd3ddae 100644
--- a/theme/standard/footer.html
+++ b/theme/standard/footer.html
@@ -4,7 +4,7 @@
 <div id="footer">
 <center>
 <hr size="1" noshade="noshade" />
-<p class="logininfo"><?php echo $loggedinas ?></p>
+<?php echo $loggedinas ?>
 <p class="homelink"><?php echo $homelink ?></p>
 <?php if (isadmin()) { ?>
 <hr size="1" noshade="noshade" />
diff --git a/theme/standard/styles_color.css b/theme/standard/styles_color.css
index bffd3d54917..bfab9c55e97 100644
--- a/theme/standard/styles_color.css
+++ b/theme/standard/styles_color.css
@@ -315,7 +315,7 @@ th {
 
 
 /* glossary, wiki */
-.generaltab {
+.generaltab, .generaltabinactive {
     background-color:#BBBBBB; /* cellheading */
 }
 
@@ -323,6 +323,18 @@ th {
     background-color:#DDDDDD; /* cellheading2 */
 }
 
+.generaltabinactive {
+    color:#CCCCCC;
+}
+
+.glossaryentryheader {
+    border-color: #BBBBBB;
+}
+
+.glossaryentry {
+    border-color: #BBBBBB;
+}
+
 
 /* lang, forum */
 .teacheronly {
diff --git a/theme/standard/styles_fonts.css b/theme/standard/styles_fonts.css
index 795755ed0d2..8fb7d68b276 100644
--- a/theme/standard/styles_fonts.css
+++ b/theme/standard/styles_fonts.css
@@ -290,6 +290,12 @@ table.formtable tbody th {
 }
 
 
+/* glossary */
+.commands {
+    font-size: 0.7em;
+}
+
+
 /*****************************
 ***
 *** Calendar
diff --git a/theme/standard/styles_layout.css b/theme/standard/styles_layout.css
index cea5d6e3bfc..211ee5484c3 100644
--- a/theme/standard/styles_layout.css
+++ b/theme/standard/styles_layout.css
@@ -316,6 +316,7 @@ table.formtable tbody th {
 }
 
 .userinfobox .links {
+    width: 100px;
     padding: 5px;
     vertical-align: bottom;
 }
@@ -430,10 +431,26 @@ dialouge, exercise, forum, lesson, quiz */
 
 /* glossary, wiki */
 .generaltab,
-.generaltabselected {
+.generaltabselected,
+.generaltabinactive {
     background:none;
 }
 
+.commands {
+    width: 200px;
+    white-space: nowrap;
+}
+
+.glossaryentryheader {
+    border-width: 1px 1px 0px 1px;
+    border-style: solid;
+}
+
+.glossaryentry {
+    border-width: 0px 1px 1px 1px;
+    border-style: solid;
+}
+
 
 /* message */
 .message_link {
diff --git a/theme/standard/styles_moz.css b/theme/standard/styles_moz.css
index 3396b2fd269..92a3a1fbe0b 100644
--- a/theme/standard/styles_moz.css
+++ b/theme/standard/styles_moz.css
@@ -60,7 +60,7 @@
 .userinfoboxsummary {
 }
 
-.generaltab {
+.generaltab, .generaltabinactive{
     -moz-border-radius-topleft:15px;
     -moz-border-radius-topright:15px;
 }
@@ -70,6 +70,14 @@
     -moz-border-radius-topright:15px;
 }
 
+.glossaryentryheader {
+    -moz-border-radius-topleft:10px;
+    -moz-border-radius-topright:10px;
+}
+
+.glossaryentry {
+}
+
 #calendar .eventlist .eventfull {
     -moz-border-radius-bottomleft:15px;
     -moz-border-radius-bottomright:15px;