diff --git a/realms/modules/auth/oauth/models.py b/realms/modules/auth/oauth/models.py
index 034880e..6988372 100644
--- a/realms/modules/auth/oauth/models.py
+++ b/realms/modules/auth/oauth/models.py
@@ -170,4 +170,4 @@ class User(BaseUser):
                 continue
             buttons.append(val.get('button'))
 
-        return "<h4>Social Login</h4>" + " ".join(buttons)
+        return "<h3>Social Login</h3>" + " ".join(buttons)
diff --git a/realms/templates/layout.html b/realms/templates/layout.html
index 59ea243..aa8a41a 100644
--- a/realms/templates/layout.html
+++ b/realms/templates/layout.html
@@ -41,12 +41,12 @@
         <div class="navbar-collapse collapse navbar-inverse-collapse">
           <ul class="nav navbar-nav">
             {% if config.get('ROOT_ENDPOINT') != 'wiki.index' %}
-              <li><a href="{{ url_for('wiki.index') }}"><i class="fa fa-list"></i> Index</a></li>
+              <li><a href="{{ url_for('wiki.index') }}"><i class="fa fa-list"></i><span class="hidden-sm"> Index</span></a></li>
             {% endif %}
-            <li><a href="{{ url_for('wiki.create') }}"><i class="fa fa-plus"></i> New</a></li>
+            <li><a href="{{ url_for('wiki.create') }}"><i class="fa fa-plus"></i><span class="hidden-sm"> New</span></a></li>
             {% if name %}
-              <li><a href="{{ url_for('wiki.edit', name=name) }}"><i class="fa fa-pencil"></i> Edit</a></li>
-              <li><a href="{{ url_for('wiki.history', name=name) }}"><i class="fa fa-clock-o"></i> History</a></li>
+              <li><a href="{{ url_for('wiki.edit', name=name) }}"><i class="fa fa-pencil"></i><span class="hidden-sm"> Edit</span></a></li>
+              <li><a href="{{ url_for('wiki.history', name=name) }}"><i class="fa fa-clock-o"></i><span class="hidden-sm"> History</span></a></li>
             {% endif %}
           </ul>
 
diff --git a/realms/templates/wiki/edit.html b/realms/templates/wiki/edit.html
index 3812f39..25289e2 100644
--- a/realms/templates/wiki/edit.html
+++ b/realms/templates/wiki/edit.html
@@ -75,7 +75,7 @@
           <button class="btn btn-default btn-sm dropdown-toggle" type="button" id="editor-actions"
                   data-toggle="dropdown" title="Actions">
             <i class="fa fa-cog"></i>
-            <span class="hidden-xs">Actions <i class="fa fa-caret-down"></i></span>
+            <span class="hidden-xs hidden-sm">Actions <i class="fa fa-caret-down"></i></span>
           </button>
 
           <ul class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="editor-actions">
@@ -98,7 +98,7 @@
           <button id="theme-list-btn" type="button" class="dropdown-toggle btn btn-default btn-sm"
                   data-toggle="dropdown" title="Change Theme">
             <i class="fa fa-paint-brush"></i>
-            <span class="hidden-xs">Theme <i class="fa fa-caret-down"></i></span>
+            <span class="hidden-xs hidden-sm">Theme <i class="fa fa-caret-down"></i></span>
           </button>
           <ul id="theme-list" class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="theme-list">
             <li><a tabindex="-1" href="#" data-value="chrome" >Chrome</a></li>
@@ -139,7 +139,7 @@
           {% else %}
             <a id="submit-btn" class="btn btn-primary btn-sm">
               <i class="fa fa-save"></i>
-              <span class="hidden-xs">Publish</span>
+              <span class="hidden-xs">Save</span>
             </a>
           {% endif %}
         </div>