From: Laury GvR <laury@gaslightmedia.com>
Date: Tue, 28 Mar 2017 14:41:04 +0000 (-0400)
Subject: Style/markup revamp for member edit admin
X-Git-Tag: v2.9.15^2~15^2~31
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=9d38b81c0b92c3156afa0f97315a14f1c68cfbd2;p=WP-Plugins%2Fglm-member-db.git

Style/markup revamp for member edit admin

Admin view for member editing has been significantly overhauled,
using our glm grid instead of tables to allow responsiveness, and
taking things out of 100% page width, contracting row width. Colors
of buttons and table areas further changed. Combined several member
info sections into fewer parent sections.
---

diff --git a/css/admin.css b/css/admin.css
index e8d03ff7..e5f534bd 100644
--- a/css/admin.css
+++ b/css/admin.css
@@ -3,7 +3,9 @@
     Gaslight Media Members Database Admin Styles
 
 */
-
+input, select, .button {
+    max-width: 100%;
+}
 #glm_members_admin_dashboard_widget > H2 > span:before {
     content: url('../assets/flame.png');
     width: 25px;
@@ -126,6 +128,21 @@
 .glm-form-textarea {
     width: 60%;
 }
+.glm-form-input-subtext {
+    line-height: 1;
+}
+
+/* Member List */
+.wp-list-table a.button.button-secondary {
+    background-color: #0568B3;
+    color: white;
+}
+
+/* Settings Table Additions */
+.glm-settings-table .glm-small-12,
+.glm-settings-table .glm-small-6 {
+    float: left;
+}
 
 /* Admin table additions */
 .glm-admin-table {
@@ -147,6 +164,21 @@
     border-radius: 3px;
     width: 100%;
     padding: 10px;
+    background-color: #f8ffff;
+}
+.glm-admin-table.glm-admin-inner-table .glm-row {
+    margin-bottom: 15px;
+}
+.glm-admin-table.glm-admin-inner-table th {
+    font-weight: normal;
+}
+#glm-admin-content-container h1,
+#glm-admin-content-container h2 {
+    margin: 5px 0;
+}
+.glm-admin-inner-table h3,
+.glm-admin-inner-table h4 {
+    margin: 0;
 }
 .glm-admin-table th,
 .glm-admin-table-narrow th {
@@ -198,6 +230,12 @@
   font-size: 12px;
   margin-bottom: 10px;
 }
+#glm-table-video h4 {
+    margin-bottom: 0;
+}
+#glm-table-live-cam h4 {
+    margin-bottom: 0;
+}
 td.glm-shrink {
   white-space: nowrap;
   width: 1px;
@@ -239,7 +277,7 @@ td.glm-nowrap {
     border: 2px #ddd solid;
     min-height: 2.5em;
     min-width: 100px;
-    float: left;
+    float: none;
     background: #fff;
     margin: .2em;
 }
@@ -277,6 +315,14 @@ td.glm-nowrap {
     height: 300px;
     border: 2px black solid;
 }
+#locationMapContainer {
+    height: 0;
+    overflow: hidden;
+    clear: both;
+}
+#locationMapContainer #locationMap {
+    width: 99%;
+}
 
 /* Debug Window */
 #glm-debug-header {
@@ -289,7 +335,7 @@ td.glm-nowrap {
     font-size: 1.3em;
 }
 .glm-debug-section-title {
-    weight: bold;
+    font-weight: bold;
 }
 .glm-debug-section-body {
     border: 1px black solid;
@@ -301,7 +347,7 @@ td.glm-nowrap {
 {
     clear: both;
     border: 1px #ccc solid;
-    height: 8em;
+    height: 9em;
     padding: .2em;
     margin: .4em .1em .4em .1em;
     background-color: #eee;
@@ -321,14 +367,29 @@ td.glm-nowrap {
 .glm-imageGalleryContainer
 {
     border: 1px #ddd solid !important;
+    overflow: hidden;
+}
+.glm-galleryImages .glm-statusTable h4 {
+    margin: 2px 0;
 }
 .glm-galleryImage
 {
     float: left;
+    text-align: left;
     height: 100%;
 /*    width: 20%;*/
     overflow: hidden;
 }
+.glm-galleryImages .glm-statusTable .glm-galleryImageDelete > * {
+    float: left;
+    margin-top: 5px;
+    margin-right: 5px;
+}
+.glm-galleryImages .glm-statusTable .glm-galleryImageFeatured > * {
+    float: left;
+    margin-top: 10px;
+    margin-right: 5px;
+}
 .glm-galleryImage img
 {
   position: relative;
@@ -389,37 +450,41 @@ td.glm-nowrap {
     margin-bottom: 2px;
 }
 .nav-tab-wrapper .nav-tab {
-    background-color: rgb(61,132,208);
-    color: white;
+/*    background-color: #3D84D0;*/
+/*    background-color: #0568b3;*/
+    background-color: lightgrey;
+    color: #333;
     font-weight: normal;
-    border: 1px solid darkblue;
+    border: 1px solid grey;
     border-radius: 3px;
     letter-spacing: 1px;
 }
 .nav-tab-wrapper .nav-tab:hover {
-    background-color: rgb(41, 112, 214);
+    background-color: #0568B3;
+    color: white;
     border: 1px inset darkblue;
 }
 .nav-tab-wrapper .nav-tab.nav-tab-active {
-    background-color: rgb(255, 155, 6);
-    color: #373737;
+    background-color: #E8680D;
+    color: white;
     font-weight: normal;
-    text-shadow: 1px 0px 0 black;
-    border: 1px inset orange;    
+    text-shadow: 1px 0px 0 lightgrey;
+    border: 1px inset #E8680D;    
 }
 .nav-tab-wrapper .nav-tab.nav-tab-active:hover {
-    background-color: rgb(250, 140, 6);
-    color: black;
+    background-color: #F18004;
+    color: white;
 }
 
 #glm-admin-content-container .button-primary {
-    background-color: rgb(61,132,208);
+    background-color: #0568B3;
     color: white;
     text-shadow: none;
     border: 1px solid darkblue;
     box-shadow: 0px 1px 0px darkblue;
 }
 #glm-admin-content-container .button-primary:hover {
+    background-color: #3D84D0;
     box-shadow: 0px -1px 0px darkblue;
 }
 #updateSettings {
@@ -442,6 +507,12 @@ input[type=submit], input[type=file] {
     float:left;
     width:50%; */
 }
+.glm-admin-amenities-container .glm-item-container {
+    background-color: #F8FFFF;
+}
+.glm-admin-categories-container .glm-item-container {
+    background-color: #F8FFFF;
+}
 #showDetail > label, #categoryBox > label{
 /*    margin:0;
     float:left;
diff --git a/views/admin/dashboardWidget/index.html b/views/admin/dashboardWidget/index.html
index 1de6800d..0590167c 100644
--- a/views/admin/dashboardWidget/index.html
+++ b/views/admin/dashboardWidget/index.html
@@ -8,7 +8,7 @@
                     Number of {$terms.term_member_plur_cap} Listed:</b> {$numbMembers}
                 </td>
                 <td>
-                    <a href="{$adminUrl}?page=glm-members-admin-menu-members&glm_action=list" class="glm-right">List Members</a>
+                    <a href="{$adminUrl}?page=glm-members-admin-menu-members&glm_action=list" class="glm-right">List {$terms.term_member_plur_cap}s</a>
                 </td>
             </tr>
             <tr>
diff --git a/views/admin/member/index.html b/views/admin/member/index.html
index fcf24f02..28b625c7 100644
--- a/views/admin/member/index.html
+++ b/views/admin/member/index.html
@@ -11,36 +11,36 @@
     {if apply_filters('glm_members_menu_members', true)}
         <p><a href="{$thisUrl}?page={$thisPage}&glm_action=memberEdit&member={$memberID}" class="button button-primary glm-button glm-right">Edit {$terms.term_member_cap} Name and Status</a></p>
     {/if}
-    <table class="glm-admin-table">
-        <tr>
+    <div class="glm-admin-table">
+        <div class="glm-row">
             <td>
-                <table class="glm-admin-table">
-                    <tr>
-                        <th>{$terms.term_member_cap} Slug:</th>
+                <div class="glm-admin-table">
+                    <div class="glm-row">
+                        <h4>{$terms.term_member_cap} Slug:</h4>
                         <td>{$member.fieldData.member_slug}</td>
-                    </tr>
-                    <tr><th>Date created:</th><td>{$member.fieldData.created.date}</td></tr>
-                    <tr>
-                        <th>URL CLick Counts</th>
+                    </div>
+                    <div class="glm-row"><h4>Date created:</h4><td>{$member.fieldData.created.date}</td></div>
+                    <div class="glm-row">
+                        <h4>URL CLick Counts</h4>
                         <td><b>Today:</b> {$clickThroughCounts.day}&nbsp;&nbsp;&nbsp;<a data-type="daysClicks" class="dialog-button" href=""><img src="{$assetsUrl}/graph.png"></a></td>
-                    </tr>
-                </table>
+                    </div>
+                </div>
             </td>
             <td>
-                <table class="glm-admin-table">
-                    <tr>
-                        <th>{$terms.term_member_cap} Display & Access:</th>
+                <div class="glm-admin-table">
+                    <div class="glm-row">
+                        <h4>{$terms.term_member_cap} Display & Access:</h4>
                         <td>{$member.fieldData.access.name}</td>
-                    </tr>
-                    <tr>
-                        <th>{$terms.term_member_cap} Type:</th>
+                    </div>
+                    <div class="glm-row">
+                        <h4>{$terms.term_member_cap} Type:</h4>
                         <td>{$member.fieldData.member_type.name}</td>
-                    </tr>            
-                    <tr>
-                        <th>Detail Page View Counts</th>
+                    </div>            
+                    <div class="glm-row">
+                        <h4>Detail Page View Counts</h4>
                         <td><b>Today:</b> {$detailViewCounts.day}&nbsp;&nbsp;&nbsp;<a data-type="daysViews" class="dialog-button" href=""><img src="{$assetsUrl}/graph.png"></a></td>
-                    </tr>
-                    <tr>
+                    </div>
+                    <div class="glm-row">
                         
                         <td>
                         {if apply_filters('glm_members_menu_members', true)}            
@@ -51,11 +51,11 @@
                             </span>
                         {/if}
                         </td>
-                    </tr>
-                </table>
+                    </div>
+                </div>
             </td>
-        </tr>
-    </table>
+        </div>
+    </div>
   {else}
         <h3>No {$terms.term_member} information available.</h3>
   {/if}
@@ -132,16 +132,16 @@
         </span>
     </p>
     <br clear="all">
-    <table class="wp-list-table striped glm-admin-table">
-        <thead>
-            <tr>
-                <th>Status</th>
-                <th>Reference Name</th>
-                <th>Created</th>
-                <th>Last Update</th>
-                <th> </th>
-            </tr>
-        </thead>
+    <div class="wp-list-table striped glm-admin-table">
+        <h4ead>
+            <div class="glm-row">
+                <h4>Status</h4>
+                <h4>Reference Name</h4>
+                <h4>Created</h4>
+                <h4>Last Update</h4>
+                <h4> </h4>
+            </div>
+        </h4ead>
         <tbody>
 
       {if $haveInfoRecords}
@@ -150,9 +150,9 @@
 
          {if $m.status.value == $statusTypeNumbers.Active || apply_filters('glm_members_permit_admin_member_index_list_inactive_info', true)}
           {if $i++ is odd by 1}
-            <tr>
+            <div class="glm-row">
           {else}
-            <tr class="alternate{if $m.status.name == 'Active'} glm-admin-table-active{/if}">
+            <div class="glm-row" class="alternate{if $m.status.name == 'Active'} glm-admin-table-active{/if}">
           {/if}
                 <td>
                     <a href="{$thisUrl}?page={$thisPage}&glm_action=memberInfo&member={$memberID}&memberInfo={$m.id}"{if $m.status.value == $statusPending} class="glm-notice"{/if}>{$m.status.name}</a>
@@ -167,16 +167,16 @@
                     {if $m.status.name != 'Active'}<a href="{$thisUrl}?page={$thisPage}&glm_action=index&member={$memberID}&activateID={$m.id}" class="button button-secondary glm-button-small glm-right">Activate</a>{/if}
           {/if}
                 </td>
-            </tr>
+            </div>
 
 
          {/if}
         {/foreach}
       {else} <!-- haveInfoRecords -->
-            <tr><td colspan="5"><a href="{$thisUrl}?page={$thisPage}&glm_action=memberInfo&member={$memberID}">Click here to start entering information for this {$terms.term_member}.</a></td></tr>
+            <div class="glm-row"><td colspan="5"><a href="{$thisUrl}?page={$thisPage}&glm_action=memberInfo&member={$memberID}">Click here to start entering information for this {$terms.term_member}.</a></td></div>
       {/if}
         </tbody>
-    </table>
+    </div>
    {/if} <!-- apply_filters -->
   {/if}
 {/if}
diff --git a/views/admin/member/memberEdit.html b/views/admin/member/memberEdit.html
index 3e239769..3b6168ae 100644
--- a/views/admin/member/memberEdit.html
+++ b/views/admin/member/memberEdit.html
@@ -28,26 +28,26 @@
         
         <!-- **** General Settings **** -->
                 
-        <table id="glm-table-general" class="glm-admin-table glm-member-table">
-            <tr>
-                <th {if $member.fieldRequired.name}class="glm-required"{/if}>{$terms.term_member_cap} Name:</th>
+        <div id="glm-table-general" class="glm-admin-table glm-member-table">
+            <div class="glm-row">
+                <h4 {if $member.fieldRequired.name}class="glm-required"{/if}>{$terms.term_member_cap} Name:</h4>
                 <td {if $member.fieldFail.name}class="glm-form-bad-input glm-form-bad-input-general"{/if}>
                     <input type="text" name="name" value="{$member.fieldData.name}" class="glm-form-text-input">
                     {if $member.fieldFail.name}<p>{$member.fieldFail.name}</p>{/if}
                 </td>
-            </tr>
+            </div>
 
       {if !$addingMember}
-            <tr>
-                <th>Name for URLs:</th>
+            <div class="glm-row">
+                <h4>Name for URLs:</h4>
                 <td>
                     {$member.fieldData.member_slug}
                 </td>
-            </tr>
+            </div>
       {/if}
             
-            <tr>
-                <th {if $member.fieldRequired.access}class="glm-required"{/if}>{$terms.term_member_cap} Display & Access:</th>
+            <div class="glm-row">
+                <h4 {if $member.fieldRequired.access}class="glm-required"{/if}>{$terms.term_member_cap} Display & Access:</h4>
                 <td {if $member.fieldFail.access}class="glm-form-bad-input glm-form-bad-input-general"{/if}>
                     <select name="access">
         {foreach from=$member.fieldData.access.list item=v}
@@ -56,9 +56,9 @@
                     </select>
                     {if $member.fieldFail.access}<p>{$member.fieldFail.access}</p>{/if}
                 </td>
-            </tr>
-            <tr>
-                <th {if $member.fieldRequired.member_type}class="glm-required"{/if}>{$terms.term_member_cap} Type:</th>
+            </div>
+            <div class="glm-row">
+                <h4 {if $member.fieldRequired.member_type}class="glm-required"{/if}>{$terms.term_member_cap} Type:</h4>
                 <td {if $member.fieldFail.member_type}class="glm-form-bad-input glm-form-bad-input-general"{/if}>
                     <select name="member_type">
         {foreach from=$member.fieldData.member_type.list item=v}
@@ -67,38 +67,38 @@
                     </select>
                     {if $member.fieldFail.member_type}<p>{$member.fieldFail.member_type}</p>{/if}
                 </td>
-            </tr>
-            <tr>
-                <th>Featured:</th>
+            </div>
+            <div class="glm-row">
+                <h4>Featured:</h4>
                 <td>
                     <input type="checkbox" name="featured" {if $member.fieldData.featured.value} checked{/if}><br>
                 </td>
-            </tr>
+            </div>
         {if !$addingMember}
-            <tr><th>Date created:</th><td>{$member.fieldData.created.date}</td></tr>
+            <div class="glm-row"><h4>Date created:</h4><td>{$member.fieldData.created.date}</td></div>
         {/if}
-            <tr>
-                <th {if $member.fieldRequired.notes}class="glm-required"{/if}>Notes:</th>
+            <div class="glm-row">
+                <h4 {if $member.fieldRequired.notes}class="glm-required"{/if}>Notes:</h4>
                 <td {if $member.fieldFail.notes}class="glm-form-bad-input glm-form-bad-input-general"{/if}>
                     <textarea name="notes" class="glm-form-textarea">{$member.fieldData.notes}</textarea>
                     {if $member.fieldFail.notes}<p>{$member.fieldFail.notes}</p>{/if}<br>
                     This "Notes" field is not displayed anywhere else. It is strictly for making and keeping
                     notes related to this {$terms.term_member} profile. 
                 </td>
-            </tr>
-        </table>
+            </div>
+        </div>
         <p><span class="glm-required">*</span> Required</p>
     {if $addingMember}
         <input id="updateMember" type="submit" value="Add new {$terms.term_member}">
     {else}
-        <input id="updateMember" type="submit" value="{if $memberID && $member}Update member{else}Add new member{/if}">
+        <input id="updateMember" type="submit" value="{if $memberID && $member}Update {$terms.term_member}{else}Add new {$terms.term_member}{/if}">
     {/if}
     </form>
   {/if}
 
  {else}        
     <h3 class="glm-error">You do not have any {$terms.term_member_cap} Types setup.</h3>
-    <p>You must have at least one {$terms.term_member_cap} Type to add a new member.</p>
+    <p>You must have at least one {$terms.term_member_cap} Type to add a new {$terms.term_member}.</p>
     <td><a href="{$thisUrl}?page=glm-members-admin-menu-configure&glm_action=memberTypes">Click here to add {$terms.term_member_cap} Types.</a></td>
  {/if}
 {else}
diff --git a/views/admin/member/memberInfo.html b/views/admin/member/memberInfo.html
index 2b96dce1..820ed116 100644
--- a/views/admin/member/memberInfo.html
+++ b/views/admin/member/memberInfo.html
@@ -83,35 +83,33 @@
         <input type="hidden" name="create_time" value="now">
       {/if}
 
-        <table class="glm-admin-table">
-            <tr>
-                <th>{$terms.term_member_cap} Name:</th>
-                <td>{$member.name}</td>
-            </tr>
+        <div class="glm-admin-table glm-small-6 left">
+            <div class="glm-row">
+                <div class="glm-small-4 glm-left"><b>{$terms.term_member_cap} Name: </b></div>
+                <div class="glm-small-8 glm-right"><span>{$member.name} </span></div>
+            </div>
       {if $memberInfoID && $memberInfo}
-            <tr>
-                <th>Access:</th>
-                <td>{$member.access.name}</td>
-            </tr>
+            <div class="glm-row">
+                <div class="glm-small-4 glm-left"><b>Access: </b></div>
+                <div class="glm-small-8 glm-right"><span>{$member.access.name} </span></div>
+            </div>
       {/if}
-        </table>
+        </div>
 
     <h2 class="nav-tab-wrapper" style="margin-bottom: 1em;">
-        <a id="glm-member-info-status" data-show-table="glm-table-status" class="glm-member-info-tab nav-tab nav-tab-active">Status</a>
-        <a id="glm-member-info-profile" data-show-table="glm-table-profile" class="glm-member-info-tab nav-tab">Profile Data</a>
+<!-- Merged into Profile Data       <a id="glm-member-info-status" data-show-table="glm-table-status" class="glm-member-info-tab nav-tab nav-tab-active">Status</a>-->
+        <a id="glm-member-info-profile" data-show-table="glm-table-profile" class="glm-member-info-tab nav-tab nav-tab-active">Profile Data</a>
 <!-- Merged into Address & Contact       <a id="glm-member-info-contact" data-show-table="glm-table-contact" class="glm-member-info-tab nav-tab">Contact Info</a>-->
         <a id="glm-member-info-cat" data-show-table="glm-table-cat" class="glm-member-info-tab nav-tab">Categories & Amenities</a>
-        <a id="glm-member-info-media" data-show-table="glm-table-media" class="glm-member-info-tab nav-tab">Media</a>
+        <a id="glm-member-info-media" data-show-table="glm-table-media" class="glm-member-info-tab nav-tab">Images/Media</a>
 <!-- Not using credit cards currently        <a id="glm-member-info-ccards" data-show-table="glm-table-ccards" class="glm-member-info-tab nav-tab">Credit Cards</a>  -->
+<!-- Not using this yet       <a id="glm-member-info-files" data-show-table="glm-table-media" class="glm-member-info-tab nav-tab">Files</a>-->
+<!-- Not using this yet       <a id="glm-member-info-additional" data-show-table="glm-table-media" class="glm-member-info-tab nav-tab">Additional Data Fields</a>-->
         {if $memberUpdated}<span class="glm-notice glm-flash-updated glm-right">{$terms.term_member_cap} Profile Updated</span>{/if}
         {if $memberUpdateError}<span class="glm-error glm-flash-updated glm-right">{$terms.term_member_cap} Profile Update Error</span>{/if}
     </h2>
-
-        <!-- Profile Status & Description -->
-
-        {include file='admin/member/memberInfo/editStatus.html'}
-
-        <!-- **** Address and Location **** -->
+      
+        <!-- **** Status, Address and Location **** -->
 
         {include file='admin/member/memberInfo/editProfile.html'}
 
@@ -127,36 +125,39 @@
 
         {include file='admin/member/memberInfo/editCreditCards.html'}
 
+        <p><span class="glm-required">*</span> Required</p>
+        <input id="updateMemberProfile" class="button-primary" type="submit" value="{if $memberInfoID && $memberInfo}Update {$terms.term_member} profile{else}Add new {$terms.term_member} profile{/if}">
+
     </form>
 
 {else} <!-- No - glm_members_permit_admin_member_info_edit -->
         <script type="text/javascript">var enableDraggable = false;</script>
 
-        <table class="glm-admin-table">
+        <div class="glm-admin-table">
 
-            <tr><th>{$terms.term_member_cap} Name:</th><td>{$member.name}</td></tr>
-            <tr><th>{$terms.term_member_cap} Type:</th><td>{$member.member_type.name}</td></tr>
-            <tr><th>Access:</th><td>{$member.access.name}</td></tr>
-            <tr><th>Created:</th><td>{$memberInfo.fieldData.create_time.datetime}</td></tr>
-            <tr><th>Last Updated:</th><td>{$memberInfo.fieldData.modify_time.datetime}</td></tr>
-            <tr><th>{$terms.term_member_cap} Info Status:</th><td>{$memberInfo.fieldData.status.name}</option></td></tr>
-            <tr><th>Reference Name:</th><td>{$memberInfo.fieldData.reference_name}</td></tr>
-            <tr>
+            <div class="glm-row"><h4>{$terms.term_member_cap} Name:</h4><td>{$member.name}</td></div>
+            <div class="glm-row"><h4>{$terms.term_member_cap} Type:</h4><td>{$member.member_type.name}</td></div>
+            <div class="glm-row"><h4>Access:</h4><td>{$member.access.name}</td></div>
+            <div class="glm-row"><h4>Created:</h4><td>{$memberInfo.fieldData.create_time.datetime}</td></div>
+            <div class="glm-row"><h4>Last Updated:</h4><td>{$memberInfo.fieldData.modify_time.datetime}</td></div>
+            <div class="glm-row"><h4>{$terms.term_member_cap} Info Status:</h4><td>{$memberInfo.fieldData.status.name}</option></td></div>
+            <div class="glm-row"><h4>Reference Name:</h4><td>{$memberInfo.fieldData.reference_name}</td></div>
+            <div class="glm-row">
                 <td>&nbsp;</td>
                 <td>
                     <h3>Descriptions</h3>
                 </td>
-            </tr>
-            <tr><th>Description:</th><td>{$memberInfo.fieldData.descr|escape:quotes}</td></tr>
-            <tr><th>Short Description:</th><td>{$memberInfo.fieldData.short_descr}</td></tr>
-            <tr>
+            </div>
+            <div class="glm-row"><h4>Description:</h4><td>{$memberInfo.fieldData.descr|escape:quotes}</td></div>
+            <div class="glm-row"><h4>Short Description:</h4><td>{$memberInfo.fieldData.short_descr}</td></div>
+            <div class="glm-row">
                 <td>&nbsp;</td>
                 <td>
                     <h3>Other Information</h3>
                 </td>
-            </tr>
-            <tr>
-                <th>Amenities</th>
+            </div>
+            <div class="glm-row">
+                <h4>Amenities</h4>
                 <td class="glm-item-container">
                     <!-- Amenity Selection -->
                 {if isset($memberInfo.fieldData.amenities) && $memberInfo.fieldData.amenities}
@@ -168,10 +169,10 @@
                     {/foreach}
                 {/if}
                 </td>
-            </tr>
-            <tr><th>Notes:</th><td>{$memberInfo.fieldData.notes}</td></tr>
-            <tr>
-                <th>Image Gallery</th>
+            </div>
+            <div class="glm-row"><h4>Notes:</h4><td>{$memberInfo.fieldData.notes}</td></div>
+            <div class="glm-row">
+                <h4>Image Gallery</h4>
                 <td class="glm-item-container glm-imageGalleryContainer">
                     <ul class="glm-galleryImages">
                     {if $haveImageGallery}
@@ -179,16 +180,16 @@
                             {if $i.file_name}
                             <li id="{$i.id}" class="glm-galleryContainer">
                                 <div class="glm-galleryImageData">
-                                    <table class="glm-statusTable">
-                                        <tr>
-                                            <th>Caption:</th>
+                                    <div class="glm-statusTable">
+                                        <div class="glm-row">
+                                            <h4>Caption:</h4>
                                             <td><input id="galleryImage_caption_{$i.id}" type="text" name="galleryImage_caption[{$i.id}]" value="{$i.caption}" class="glm-form-text-input-medium"></td>
-                                       </tr>
-                                        <tr>
-                                            <th>Description:</th>
+                                       </div>
+                                        <div class="glm-row">
+                                            <h4>Description:</h4>
                                             <td><textarea name="galleryImage_descr[{$i.id}]">{$i.descr}</textarea></td>
-                                        </tr>
-                                    </table>
+                                        </div>
+                                    </div>
                                 </div>
                                 <div class="glm-galleryImage" data-id="{$i.id}">
                                     <img src="{$glmPluginMediaUrl}/images/small/{$i.file_name}">
@@ -200,8 +201,8 @@
                     {/if}
                     </div>
                 </td>
-            </tr>
-        </table>
+            </div>
+        </div>
 {/if} <!-- glm_members_permit_admin_member_info_edit -->
 
     <script type="text/javascript">
@@ -215,7 +216,7 @@
             });
 
             // Do inital setup on load for first tab
-            glmSetupAreaTab($('#glm-member-info-status'));
+            glmSetupAreaTab($('#glm-member-info-profile'));
 
             // Setup edit area selected
             function glmSetupAreaTab(t) {
@@ -600,6 +601,29 @@
                 glmGeocode();
 
             });
+            
+            /*
+             * Map Display Toggle
+             */
+            $("#locationMapToggle").click(function() {
+                var mapC = "#locationMapContainer";
+                var map = "#locationMap";
+                var mapNewH = 0;
+                var mapOverflow = 'hidden';
+                var mapBtnTxt = 'View Map';
+                if ($(mapC).height() == 0) {
+                    mapNewH = 400;
+                    mapV = 'visible';
+                    mapBtnTxt = 'Hide Map'
+                }
+                $(mapC).animate({
+                    overflow: mapOverflow,
+                    height: mapNewH
+                }, 250, "swing", function() {
+
+                });
+                $(this).html(mapBtnTxt);
+            });
 
             /*
              * Map operations
diff --git a/views/admin/member/memberInfo/editCategory.html b/views/admin/member/memberInfo/editCategory.html
index 33ef96a1..f3ed178e 100644
--- a/views/admin/member/memberInfo/editCategory.html
+++ b/views/admin/member/memberInfo/editCategory.html
@@ -1,8 +1,8 @@
 
-        <table id="glm-table-cat" class="glm-admin-table glm-hidden glm-member-info-table">
-            <tr>
-                <th>Categories</th>
-                <td class="glm-item-container">
+        <div id="glm-table-cat" class="glm-admin-table glm-hidden glm-member-info-table">
+            <div class="glm-row glm-admin-categories-container">
+                <h2>Categories</h2>
+                <div class="glm-item-container glm-small-12">
                     <!--  Add new category dialog -->
 
                 {if apply_filters('glm_members_menu_members', true)}
@@ -10,17 +10,17 @@
                 {/if}
 
                     <div id="newCategoryDialog" class="glm-dialog-box" title="Enter a New Category">
-                            <table class="glm-admin-table">
-                                <tr>
-                                    <th class="glm-required">Category Name:</th>
-                                    <td id="newCatNameTD">
+                            <div class="glm-admin-table">
+                                <div class="glm-row">
+                                    <h4 class="glm-required">Category Name:</h4>
+                                    <div class="glm-small-12" id="newCatNameTD">
                                         <input id="newCatName" type="text" name="newCatName" class="glm-form-text-input">
                                         <div id="newCatNameRequired"></div>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <th>Parent Category:</th>
-                                    <td>
+                                    </div>
+                                </div>
+                                <div class="glm-row">
+                                    <h4>Parent Category:</h4>
+                                    <div class="glm-small-12">
                                         <select id="newCatParent" name="newCatParent">
                                         {if $availableCategories}
                                             <option value=""></option>
@@ -33,9 +33,9 @@
                                         </select>
                                         <br>OR<br>
                                         <input id="newCatParentName" type="text" name="newCatParentName" placeholder="Enter a new parent name."> 
-                                    </td>
-                                </tr>
-                            </table>
+                                    </div>
+                                </div>
+                            </div>
                             <p><span class="glm-required">*</span> Required</p>
                             <a id="newCategoryCancel" class="button button-primary glm-right">Cancel</a>
                             <input id="newCategorySubmit" type="submit" value="Add new Category">
@@ -71,11 +71,11 @@
                         {/foreach}
                     {/if}                    
                     </div>
-                </td>
-            </tr>
-            <tr>
-                <th>Amenities</th>
-                <td class="glm-item-container">
+                </div>
+            </div>
+            <div class="glm-row glm-admin-amenities-container">
+                <h2>Amenities</h2>
+                <div class="glm-item-container glm-small-12">
                     <!-- Amenity Selection -->
                     <select name="amenitySelect" id="amenitySelect">
                     {if $availableAmenities}
@@ -100,7 +100,7 @@
                         {/foreach}
                     {/if}                    
                     </div>
-                </td>
-            </tr>
-        </table>
+                </div>
+            </div>
+        </div>
 
diff --git a/views/admin/member/memberInfo/editContact.html b/views/admin/member/memberInfo/editContact.html
index 4948aedd..36d755d1 100644
--- a/views/admin/member/memberInfo/editContact.html
+++ b/views/admin/member/memberInfo/editContact.html
@@ -1,74 +1,74 @@
-<table id="glm-table-contact" class="glm-admin-table glm-hidden glm-member-info-table">
-    <tr>
-        <th {if $memberInfo.fieldRequired.phone}class="glm-required"{/if}>Phone #:</th>
-        <td {if $memberInfo.fieldFail.phone}class="glm-form-bad-input" data-tabid="glm-member-info-contact"{/if}>
+<div id="glm-table-contact" class="glm-admin-table glm-hidden glm-member-info-table">
+    <div class="glm-row">
+        <h4 {if $memberInfo.fieldRequired.phone}class="glm-required"{/if}>Phone #:</h4>
+        <div class="glm-small-12" {if $memberInfo.fieldFail.phone}class="glm-form-bad-input" data-tabid="glm-member-info-contact"{/if}>
             <input type="text" name="phone" value="{$memberInfo.fieldData.phone}" class="glm-form-text-input-short glm-phone-input" >
             {if $memberInfo.fieldFail.phone}<p>{$memberInfo.fieldFail.phone}</p>{/if}
-        </td>
-    </tr>
-    <tr>
-        <th {if $memberInfo.fieldRequired.toll_free}class="glm-required"{/if}>Toll Free #:</th>
-        <td {if $memberInfo.fieldFail.toll_free}class="glm-form-bad-input" data-tabid="glm-member-info-contact"{/if}>
+        </div>
+    </div>
+    <div class="glm-row">
+        <h4 {if $memberInfo.fieldRequired.toll_free}class="glm-required"{/if}>Toll Free #:</h4>
+        <div class="glm-small-12" {if $memberInfo.fieldFail.toll_free}class="glm-form-bad-input" data-tabid="glm-member-info-contact"{/if}>
             <input type="text" name="toll_free" value="{$memberInfo.fieldData.toll_free}" class="glm-form-text-input-short glm-phone-input" placeholder="ex: 800.123.4567 [ext 123]">
             {if $memberInfo.fieldFail.toll_free}<p>{$memberInfo.fieldFail.toll_free}</p>{/if}
-        </td>
-    </tr>
-    <tr>
-        <th {if $memberInfo.fieldRequired.email}class="glm-required"{/if}>E-Mail Address:</th>
-        <td {if $memberInfo.fieldFail.email}class="glm-form-bad-input" data-tabid="glm-member-info-contact"{/if}>
+        </div>
+    </div>
+    <div class="glm-row">
+        <h4 {if $memberInfo.fieldRequired.email}class="glm-required"{/if}>E-Mail Address:</h4>
+        <div class="glm-small-12" {if $memberInfo.fieldFail.email}class="glm-form-bad-input" data-tabid="glm-member-info-contact"{/if}>
             <input type="text" name="email" value="{$memberInfo.fieldData.email}" class="glm-form-text-input-short" placeholder="ex: info@gaslightmedia.com">
             {if $memberInfo.fieldFail.email}<p>{$memberInfo.fieldFail.email}</p>{/if}
-        </td>
-    </tr>
-    <tr>
-        <th {if $memberInfo.fieldRequired.url}class="glm-required"{/if}>Web Address (URL):</th>
-        <td {if $memberInfo.fieldFail.url}class="glm-form-bad-input" data-tabid="glm-member-info-contact"{/if}>
+        </div>
+    </div>
+    <div class="glm-row">
+        <h4 {if $memberInfo.fieldRequired.url}class="glm-required"{/if}>Web Address (URL):</h4>
+        <div class="glm-small-12" {if $memberInfo.fieldFail.url}class="glm-form-bad-input" data-tabid="glm-member-info-contact"{/if}>
         {if $memberInfo.fieldData.url}
             <a class="button button-secondary glm-right" href="{$memberInfo.fieldData.url}" target="urlTarget">Test Link</a>
         {/if}
             <input type="text" name="url" value="{$memberInfo.fieldData.url}" class="glm-form-text-input-medium" placeholder="ex: http://www.gaslightmedia.com">
             {if $memberInfo.fieldFail.url}<p>{$memberInfo.fieldFail.url}</p>{/if}
-        </td>
-    </tr>
-    <tr>
-        <th {if $memberInfo.fieldRequired.reservation_url}class="glm-required"{/if}>Reservation URL:</th>
-        <td {if $memberInfo.fieldFail.reservation_url}class="glm-form-bad-input" data-tabid="glm-member-reservation-url"{/if}>
+        </div>
+    </div>
+    <div class="glm-row">
+        <h4 {if $memberInfo.fieldRequired.reservation_url}class="glm-required"{/if}>Reservation URL:</h4>
+        <div class="glm-small-12" {if $memberInfo.fieldFail.reservation_url}class="glm-form-bad-input" data-tabid="glm-member-reservation-url"{/if}>
         {if $memberInfo.fieldData.reservation_url}
             <a class="button button-secondary glm-right" href="{$memberInfo.fieldData.reservation_url}" target="urlTarget">Test Link</a>
         {/if}
             <input type="text" name="reservation_url" value="{$memberInfo.fieldData.reservation_url}" class="glm-form-text-input-medium" placeholder="ex: http://www.gaslightmedia.com">
             {if $memberInfo.fieldFail.reservation_url}<p>{$memberInfo.fieldFail.reservation_url}</p>{/if}
-        </td>
-    </tr>
-    <tr>
-        <th {if $memberInfo.fieldRequired.mailing_addr1}class="glm-required"{/if}>Mailing Address 1:</th>
-        <td {if $memberInfo.fieldFail.mailing_addr1}class="glm-form-bad-input" data-tabid="glm-member-info-contact"{/if}>
+        </div>
+    </div>
+    <div class="glm-row">
+        <h4 {if $memberInfo.fieldRequired.mailing_addr1}class="glm-required"{/if}>Mailing Address 1:</h4>
+        <div class="glm-small-12" {if $memberInfo.fieldFail.mailing_addr1}class="glm-form-bad-input" data-tabid="glm-member-info-contact"{/if}>
             <input type="text" name="mailing_addr1" value="{$memberInfo.fieldData.mailing_addr1}" class="glm-form-text-input-short">
             {if $memberInfo.fieldFail.mailing_addr1}<p>{$memberInfo.fieldFail.mailing_addr1}</p>{/if}
-        </td>
-    </tr>
-    <tr>
-        <th {if $memberInfo.fieldRequired.mailing_addr2}class="glm-required"{/if}>Mailing Address 2:</th>
-        <td {if $memberInfo.fieldFail.mailing_addr2}class="glm-form-bad-input" data-tabid="glm-member-info-contact"{/if}>
+        </div>
+    </div>
+    <div class="glm-row">
+        <h4 {if $memberInfo.fieldRequired.mailing_addr2}class="glm-required"{/if}>Mailing Address 2:</h4>
+        <div class="glm-small-12" {if $memberInfo.fieldFail.mailing_addr2}class="glm-form-bad-input" data-tabid="glm-member-info-contact"{/if}>
             <input type="text" name="mailing_addr2" value="{$memberInfo.fieldData.mailing_addr2}" class="glm-form-text-input-short">
             {if $memberInfo.fieldFail.mailing_addr2}<p>{$memberInfo.fieldFail.mailing_addr2}</p>{/if}
-        </td>
-    </tr>
-    <tr>
-        <th {if $memberInfo.fieldRequired.mailing_city}class="glm-required"{/if}>Mailing City:</th>
-        <td {if $memberInfo.fieldFail.mailing_city}class="glm-item-container glm-form-bad-input" data-tabid="glm-member-info-contact"{else}class="glm-item-container"{/if}>
+        </div>
+    </div>
+    <div class="glm-row">
+        <h4 {if $memberInfo.fieldRequired.mailing_city}class="glm-required"{/if}>Mailing City:</h4>
+        <div class="glm-small-12" {if $memberInfo.fieldFail.mailing_city}class="glm-item-container glm-form-bad-input" data-tabid="glm-member-info-contact"{else}class="glm-item-container"{/if}>
             <!--  Add new city dialog -->
             <div id="newMailingCityButton" class="button button-secondary glm-right">Add a new City</div>
             <div id="newMailingCityDialog" class="glm-dialog-box" title="Enter a New City">
-                <table class="glm-admin-table">
-                    <tr>
-                        <th class="glm-required">City Name:</th>
-                        <td id="newMailingCityNameTD">
+                <div class="glm-admin-table">
+                    <div class="glm-row">
+                        <h4 class="glm-required">City Name:</h4>
+                        <div class="glm-small-12" id="newMailingCityNameTD">
                             <input id="newMailingCityName" type="text" name="newMailingCityName" class="glm-form-text-input">
                             <div id="newMailingCityNameRequired"></div>
-                        </td>
-                    </tr>
-                </table>
+                        </div>
+                    </div>
+                </div>
                 <p><span class="glm-required">*</span> Required</p>
                 <a id="newMailingCityCancel" class="button button-primary glm-right">Cancel</a>
                 <input id="newMailingCitySubmit" type="submit" value="Add new City">
@@ -83,11 +83,11 @@
                 {/foreach}
             </select>
             {if $memberInfo.fieldFail.mailing_city}<p>{$memberInfo.fieldFail.mailing_city}</p>{/if}
-        </td>
-    </tr>
-    <tr>
-        <th {if $memberInfo.fieldRequired.mailing_state}class="glm-required"{/if}>Mailing State:</th>
-        <td {if $memberInfo.fieldFail.mailing_state}class="glm-form-bad-input" data-tabid="glm-member-info-contact"{/if}>
+        </div>
+    </div>
+    <div class="glm-row">
+        <h4 {if $memberInfo.fieldRequired.mailing_state}class="glm-required"{/if}>Mailing State:</h4>
+        <div class="glm-small-12" {if $memberInfo.fieldFail.mailing_state}class="glm-form-bad-input" data-tabid="glm-member-info-contact"{/if}>
             <select id="mailing_state" name="mailing_state">
                 <option value=""></option>
                 {foreach from=$memberInfo.fieldData.mailing_state.list item=v}
@@ -97,14 +97,14 @@
                 {/foreach}
             </select>
             {if $memberInfo.fieldFail.mailing_state}<p>{$memberInfo.fieldFail.mailing_state}</p>{/if}
-        </td>
-    </tr>
-    <tr>
-        <th {if $memberInfo.fieldRequired.mailing_zip}class="glm-required"{/if}>Mailing Zip:</th>
-        <td {if $memberInfo.fieldFail.mailing_zip}class="glm-form-bad-input" data-tabid="glm-member-info-contact"{/if}>
+        </div>
+    </div>
+    <div class="glm-row">
+        <h4 {if $memberInfo.fieldRequired.mailing_zip}class="glm-required"{/if}>Mailing Zip:</h4>
+        <div class="glm-small-12" {if $memberInfo.fieldFail.mailing_zip}class="glm-form-bad-input" data-tabid="glm-member-info-contact"{/if}>
             <input type="text" name="mailing_zip" value="{$memberInfo.fieldData.mailing_zip}" class="glm-form-text-input-short">
             {if $memberInfo.fieldFail.mailing_zip}<p>{$memberInfo.fieldFail.mailing_zip}</p>{/if}
-        </td>
-    </tr>
-</table>
+        </div>
+    </div>
+</div>
 
diff --git a/views/admin/member/memberInfo/editCreditCards.html b/views/admin/member/memberInfo/editCreditCards.html
index e587ae7f..a71aaaee 100644
--- a/views/admin/member/memberInfo/editCreditCards.html
+++ b/views/admin/member/memberInfo/editCreditCards.html
@@ -1,15 +1,12 @@
 
-        <table id="glm-table-ccards" class="glm-admin-table glm-hidden glm-member-info-table">
-            <tr>
-                <th {if $memberInfo.fieldRequired.cc_type}class="glm-required"{/if}>Credit Cards Accepted:</th>
-                <td {if $memberInfo.fieldFail.cc_type}class="glm-form-bad-input" data-tabid="glm-member-info-ccards"{/if}>
+        <div id="glm-table-ccards" class="glm-admin-table glm-hidden glm-member-info-table">
+            <div class="glm-row">
+                <h4 {if $memberInfo.fieldRequired.cc_type}class="glm-required"{/if}>Credit Cards Accepted:</h4>
+                <div class="glm-small-12" {if $memberInfo.fieldFail.cc_type}class="glm-form-bad-input" data-tabid="glm-member-info-ccards"{/if}>
         {foreach from=$memberInfo.fieldData.cc_type.bitmap item=v}
                     <input type="checkbox" name="cc_type[{$v.value}]" value="{$v.value}"{if $v.default} checked{/if}> {$v.name}<br>
         {/foreach}                    
                     {if $memberInfo.fieldFail.cc_type}<p>{$memberInfo.fieldFail.cc_type}</p>{/if}
-                </td>
-            </tr>
-        </table>
-
-        <p><span class="glm-required">*</span> Required</p>
-        <input id="updateMemberProfile" type="submit" value="{if $memberInfoID && $memberInfo}Update {$terms.term_member} profile{else}Add new {$terms.term_member} profile{/if}">
+                </div>
+            </div>
+        </div>
\ No newline at end of file
diff --git a/views/admin/member/memberInfo/editMediaCamera.html b/views/admin/member/memberInfo/editMediaCamera.html
index 3bd4718d..eb8f1370 100644
--- a/views/admin/member/memberInfo/editMediaCamera.html
+++ b/views/admin/member/memberInfo/editMediaCamera.html
@@ -1,9 +1,9 @@
         
         <h2>Live Camera</h2>
-        <table id="glm-table-live-cam" class="glm-admin-table">
-            <tr>
-                <th {if $memberInfo.fieldRequired.live_cam_type}class="glm-required"{/if}>Type:</th>
-                <td {if $memberInfo.fieldFail.live_cam_type}class="glm-form-bad-input" data-tabid="glm-member-info-live-cam"{/if}>
+        <div id="glm-table-live-cam" class="glm-admin-table">
+            <div class="glm-row">
+                <h4 {if $memberInfo.fieldRequired.live_cam_type}class="glm-required"{/if}>Type:</h4>
+                <div class="glm-small-12" {if $memberInfo.fieldFail.live_cam_type}class="glm-form-bad-input" data-tabid="glm-member-info-live-cam"{/if}>
                     <select id="glm-live-cam-type" name="live_cam_type">
         {foreach from=$memberInfo.fieldData.live_cam_type.list item=v}
             
@@ -11,26 +11,26 @@
         {/foreach}
                     </select>
                     {if $memberInfo.fieldFail.live_cam_type}<p>{$memberInfo.fieldFail.live_cam_type}</p>{/if}
-                </td>
-            </tr>
-            <tr id="glm-live-cam-url">
-                <th {if $memberInfo.fieldRequired.live_cam_url}class="glm-required"{/if}>URL:</th>
-                <td {if $memberInfo.fieldFail.live_cam_url}class="glm-form-bad-input" data-tabid="glm-member-info-live-cam"{/if}>
+                </div>
+            </div>
+            <div class="glm-row" id="glm-live-cam-url">
+                <h4 {if $memberInfo.fieldRequired.live_cam_url}class="glm-required"{/if}>URL:</h4>
+                <div class="glm-small-12" {if $memberInfo.fieldFail.live_cam_url}class="glm-form-bad-input" data-tabid="glm-member-info-live-cam"{/if}>
                     <input type="text" name="live_cam_url" value="{$memberInfo.fieldData.live_cam_url}" class="glm-form-text-input-medium-long" placeholder="ex: http://cams.gaslightmedia.com/cameras/images/GLM-Basin-Small.jpg">
                     {if $memberInfo.fieldFail.live_cam_url}<p>{$memberInfo.fieldFail.live_cam_url}</p>{/if}
-                </td>
-            </tr>
-            <tr class="not-with-url-type">
-                <th {if $memberInfo.fieldRequired.live_cam_title}class="glm-required"{/if}>Title to Display:</th>
-                <td {if $memberInfo.fieldFail.video_title}class="glm-form-bad-input" data-tabid="glm-member-info-live-cam"{/if}>
+                </div>
+            </div>
+            <div class="glm-row" class="not-with-url-type">
+                <h4 {if $memberInfo.fieldRequired.live_cam_title}class="glm-required"{/if}>Title to Display:</h4>
+                <div class="glm-small-12" {if $memberInfo.fieldFail.video_title}class="glm-form-bad-input" data-tabid="glm-member-info-live-cam"{/if}>
                     <input type="text" name="live_cam_title" value="{$memberInfo.fieldData.live_cam_title}" class="glm-form-text-input-medium glm-char-count" data-msgArea="video-title-msg" maxlength="80">
                     {if $memberInfo.fieldFail.live_cam_title}<p>{$memberInfo.fieldFail.live_cam_title}</p>{/if}<br>
                     <span id="live-cam-title-msg"></span>
-                </td>
-            </tr>
-            <tr class="not-with-url-type glm-hidden">
-                <th {if $memberInfo.fieldRequired.live_cam_descr}class="glm-required"{/if}>Description to Display:</th>
-                <td {if $memberInfo.fieldFail.live_cam_descr}class="glm-form-bad-input" data-tabid="glm-member-info-live-cam"{/if}>
+                </div>
+            </div>
+            <div class="glm-row" class="not-with-url-type glm-hidden">
+                <h4 {if $memberInfo.fieldRequired.live_cam_descr}class="glm-required"{/if}>Description to Display:</h4>
+                <div class="glm-small-12" {if $memberInfo.fieldFail.live_cam_descr}class="glm-form-bad-input" data-tabid="glm-member-info-live-cam"{/if}>
                     {php} 
                         wp_editor('{$memberInfo.fieldData.live_cam_descr|escape:quotes}', 'glm_live_cam_descr', array(
                             'media_buttons' => false,
@@ -42,6 +42,6 @@
                         ));
                     {/php}
                     {if $memberInfo.fieldFail.live_cam_descr}<p>{$memberInfo.fieldFail.live_cam_descr}</p>{/if}
-                </td>
-            </tr>
-        </table>
+                </div>
+            </div>
+        </div>
diff --git a/views/admin/member/memberInfo/editMediaImages.html b/views/admin/member/memberInfo/editMediaImages.html
index 7939f0a9..014dbdb3 100644
--- a/views/admin/member/memberInfo/editMediaImages.html
+++ b/views/admin/member/memberInfo/editMediaImages.html
@@ -1,43 +1,43 @@
 
         <h2>Images</h2>
-        <table id="glm-table-images" class="glm-admin-table">
-            <tr>
-                <td>&nbsp;</td>
-                <td>
+        <div id="glm-table-images" class="glm-admin-table">
+            <div class="glm-row">
+                <div>&nbsp;</div>
+                <div class="glm-small-12">
                     <p>
                         Best image size to provide is between 800 and 1000 pixels wide and stored as a JPG or JPEG file. 
                         Also try to supply images that have a reasonable "aspect ratio" (not too tall, not too wide).
                         Files provided like this should have a file size of 100 to 250 KB. Images will be automatically
                         resized for use in the Web site. Images that are too large will be rejected.
                    </p>
-                </td>
-            </tr>
-            <tr>
-                <th {if $memberInfo.fieldRequired.logo}class="glm-required"{/if}>Profile Image:</th>
-                <td {if $memberInfo.fieldFail.logo}class="glm-form-bad-input" data-tabid="glm-member-info-images"{/if}>
-                    <table class="glm-admin-image-edit-table">
+                </div>
+            </div>
+            <div class="glm-row">
+                <h4 {if $memberInfo.fieldRequired.logo}class="glm-required"{/if}>Profile Image:</h4>
+                <div class="glm-small-6" {if $memberInfo.fieldFail.logo}class="glm-form-bad-input" data-tabid="glm-member-info-images"{/if}>
+                    <div class="glm-admin-image-edit-table">
         {if $memberInfo.fieldData.logo}
-                        <tr>
-                            <td>
+                        <div class="glm-row">
+                            <div class="glm-small-12">
                                 <div class="glm-galleryImage" data-id="logo">
                                     <img src="{$glmPluginMediaUrl}/images/small/{$memberInfo.fieldData.logo}">
                                 </div>
-                            </td>
-                            <td>
+                            </div>
+                            <div class="glm-small-12">
                                 <input type="checkbox" name="logo_delete"> Delete Image<br>
                                 {$memberInfo.fieldData.logo}<br>
-                            </td>
-                        </tr>
+                            </div>
+                        </div>
         {/if}
-                        <tr><td colspan="2"><b>New image:</b> <input type="file" name="logo_new"></td></tr>
-                    </table>
+                        <div class="glm-row"><div class="glm-small-12"><b>New image:</b> <input type="file" name="logo_new"></div></div>
+                    </div>
                     <div id="glm-galleryImageLarger_logo" class="glm-imageDialog"><img src="{$glmPluginMediaUrl}/images/large/{$memberInfo.fieldData.logo}"></div>
                     {if $memberInfo.fieldFail.logo}<p>{$memberInfo.fieldFail.logo}</p>{/if}
-                </td>
-            </tr>
-            <tr>
-                <th>Image Gallery</th>
-                <td class="glm-item-container glm-imageGalleryContainer">
+                </div>
+            </div>
+            <div class="glm-row">
+                <h4>Image Gallery</h4>
+                <div class="glm-item-container glm-imageGalleryContainer glm-small-12">
                 
     {if $memberInfoID}                
                     <input type="hidden" id="galleryPositionOrder" name="galleryPositionOrder" 
@@ -55,22 +55,22 @@
                                 
                                 <!-- Start of upload status pop-up template - Parameters are of the form "[name]" -->
                                 <b><u>Uploading Image { thisFile } of { numbFiles }</u></b>
-                                <table class="glm-statusTable">
-                                    <tr>
-                                        <td class="glm-statusImageTD" rowspan="5">
+                                <div class="glm-statusTable">
+                                    <div class="glm-row">
+                                        <div class="glm-statusImageTD glm-small-12">
                                             <div class="glm-statusImageContainer">
                                                 <bust-stupid-ngg-image-selection src="{ fileImage }"></bust-stupid-ngg-image-selection>
                                             </div>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td><div style="float: right; margin: .2em .2em 0 0;" id="imageUploadCancel" class="button button-primary glm-right">Cancel Upload</div></td>
-                                        <td class="glm-statusPrompt">Name: </td><td class="glm-statusValue">{ fileName }</td>
-                                    </tr>
-                                    <tr><td class="glm-statusPrompt">Type: </td><td class="glm-statusValue">{ fileType }</td></tr>
-                                    <tr><td class="glm-statusPrompt">Size: </td><td class="glm-statusValue">{ fileSize }</td></tr>
-                                    <tr><td class="glm-statusPrompt">Progress: </td><td class="glm-statusValue"><div class="glm-progressBarContainer"><div class="glm-progressBar"></div></div></td></tr>
-                                </table>
+                                        </div>
+                                    </div>
+                                    <div class="glm-row">
+                                        <div class="glm-small-12"><div style="float: right; margin: .2em .2em 0 0;" id="imageUploadCancel" class="button button-primary glm-right">Cancel Upload</div></div>
+                                        <div class="glm-small-12" class="glm-statusPrompt">Name: </div><div class="glm-statusValue">{ fileName }</div>
+                                    </div>
+                                    <div class="glm-row"><div class="glm-statusPrompt">Type: </div><div class="glm-statusValue">{ fileType }</div></div>
+                                    <div class="glm-row"><div class="glm-statusPrompt">Size: </div><div class="glm-statusValue">{ fileSize }</div></div>
+                                    <div class="glm-row"><div class="glm-statusPrompt">Progress: </div><div class="glm-statusValue"><div class="glm-progressBarContainer"><div class="glm-progressBar"></div></div></div></div>
+                                </div>
                                 <!-- End of template -->
                                 
                             </div>
@@ -83,29 +83,32 @@
                                     Note that these input fields are dissabled to avoid the template fields being submitted. The imageUpload.js
                                     code enables the fields when it replicates the template for a new image. 
                                 -->
+                                
                                 <li id="{ id }" class="glm-galleryContainer">
-                                    <div class="glm-galleryImageData">
-                                        <table class="glm-statusTable">
-                                            <tr>
-                                                <th>Caption:</th>
-                                                <td><input id="galleryImage_caption_{ id }" type="text" name="galleryImage_caption[{ id }]" value="" class="glm-form-text-input-medium" disabled></td>
-                                                <td rowspan="2">
-                                                    <table>
-                                                        <tr><th>Delete:</th><td><input type="checkbox" name="galleryImage_delete[{ id }]" disabled></td></tr>
-                                                        <tr><th>featured Image:</th><td><input type="radio" name="galleryImage_featured" value="{ id }"></td></tr>
-                                                        <tr><th colspan="2" class="glm-notice" style="font-size: 1.2em;">New Upload</th></tr>
-                                                    </table>                             
-                                                </td>
-                                            </tr>
-                                            <tr>
-                                                <th>Description:</th>
-                                                <td><textarea name="galleryImage_descr[{ id }]" disabled></textarea></td>
-                                            </tr>
-                                        </table>
-                                    </div>
+                                    
                                     <div class="glm-galleryImage" data-id="{ id }">
                                         <bust-stupid-ngg-image-selection src="{$glmPluginMediaUrl}/images/small/{ filename }"></bust-stupid-ngg-image-selection>
                                     </div>
+                                    
+                                    <div class="glm-galleryImageData">
+                                        <div class="glm-statusTable">
+                                            <div class="glm-row">
+                                                <h4>Caption:</h4>
+                                                <div class="glm-small-12"><input id="galleryImage_caption_{ id }" type="text" name="galleryImage_caption[{ id }]" value="" class="glm-form-text-input-medium" disabled></div>
+                                                <div class="glm-small-12" rowspan="2">
+                                                    <div>
+                                                        <div class="glm-row"><h4>Delete:</h4><div class="glm-small-12"><input type="checkbox" name="galleryImage_delete[{ id }]" disabled></div></div>
+                                                        <div class="glm-row"><h4>featured Image:</h4><div class="glm-small-12"><input type="radio" name="galleryImage_featured" value="{ id }"></div></div>
+                                                        <div class="glm-row"><h4 colspan="2" class="glm-notice" style="font-size: 1.2em;">New Upload</h4></div>
+                                                    </div>                             
+                                                </div>
+                                            </div>
+                                            <div class="glm-row">
+                                                <h4>Description:</h4>
+                                                <div class="glm-small-12"><textarea name="galleryImage_descr[{ id }]" disabled></textarea></div>
+                                            </div>
+                                        </div>
+                                    </div>
                                 </li>
                                 <div id="glm-galleryImageLarger2_{ id }" class="glm-imageDialog">
                                     <bust-stupid-ngg-image-selection src="{$glmPluginMediaUrl}/images/large/{ filename }"></bust-stupid-ngg-image-selection>
@@ -126,30 +129,47 @@
             {foreach $imageGallery as $i}
                 {if $i.file_name}
                         <li id="{$i.id}" class="glm-galleryContainer">
-                            <div class="glm-galleryImageData">
-                                <table class="glm-statusTable">
-                                    <tr>
-                                        <th>Caption:</th>
-                                        <td><input id="galleryImage_caption_{$i.id}" type="text" name="galleryImage_caption[{$i.id}]" value="{$i.caption}" class="glm-form-text-input-medium"></td>
-                                        <td rowspan="2">
-                                            <table>
-                                                <tr><th>Delete:</th><td><input type="checkbox" name="galleryImage_delete[{$i.id}]"></td></tr>
-                                                <tr><th>Featured Image:</th><td><input type="radio" name="galleryImage_featured" value="{$i.id}" {if $i.featured.value}checked="checked"{/if}></td></tr>
-                                            </table>                             
-                                            <input type="hidden" name="galleryImage_position[{$i.id}]" value="{$i.position}">
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <th>Description:</th>
-                                        <td><textarea name="galleryImage_descr[{$i.id}]">{$i.descr}</textarea></td>
-                                        <th colspan="2">
-                                        </th>
-                                    </tr>
-                                </table>
-                            </div>
-                            <div class="glm-galleryImage" data-id="{$i.id}">
+                            
+                            <div class="glm-galleryImage glm-small-3" data-id="{$i.id}">
                                 <img src="{$glmPluginMediaUrl}/images/small/{$i.file_name}">
                             </div>
+                            <div class="glm-galleryImageData glm-small-9">
+                                <div class="glm-statusTable glm-row">
+                                    
+                                    <div class="glm-small-8 glm-left">
+                                        <h4>Caption:</h4>
+                                        <div class="glm-small-12">
+                                            <input id="galleryImage_caption_{$i.id}" type="text" name="galleryImage_caption[{$i.id}]" value="{$i.caption}" class="glm-form-text-input-medium">
+                                        </div>
+                                        
+                                        <h4>Description:</h4>
+                                        <div class="glm-small-12">
+                                            <textarea name="galleryImage_descr[{$i.id}]">{$i.descr}</textarea>
+                                        </div>
+                                        
+                                    </div>
+                                    
+                                    <div class="glm-small-4 glm-left">
+                                        <div class="glm-small-12">
+                                            <div>
+                                                <div class="glm-row glm-galleryImageDelete">
+                                                    <h4>Delete:</h4>
+                                                    <div>
+                                                        <input type="checkbox" name="galleryImage_delete[{$i.id}]">
+                                                    </div>
+                                                </div>
+                                                <div class="glm-row glm-galleryImageFeatured">
+                                                    <h4>Featured Image:</h4>
+                                                    <div>
+                                                        <input type="radio" name="galleryImage_featured" value="{$i.id}" {if $i.featured.value}checked="checked"{/if}>
+                                                    </div>
+                                                </div>
+                                            </div>                             
+                                            <input type="hidden" name="galleryImage_position[{$i.id}]" value="{$i.position}">
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
                             <div id="glm-galleryImageLarger_{$i.id}" class="glm-imageDialog"><img src="{$glmPluginMediaUrl}/images/large/{$i.file_name}"></div>
                 {/if}
                        </li>
@@ -162,6 +182,6 @@
                     You are editing information to create a new record.
                     <br>After you click "Add new {$terms.term_member}" below, you may come back here to add images to the gallery.
     {/if}          
-                </td>
-            </tr>
-        </table>
+                </div>
+            </div>
+        </div>
diff --git a/views/admin/member/memberInfo/editMediaVideo.html b/views/admin/member/memberInfo/editMediaVideo.html
index 5e28ab97..b3d76c2b 100644
--- a/views/admin/member/memberInfo/editMediaVideo.html
+++ b/views/admin/member/memberInfo/editMediaVideo.html
@@ -1,8 +1,8 @@
 
         <h2>Video</h2>
-        <table id="glm-table-video" class="glm-admin-table">
-            <tr style="display:none">
-                <th {if $memberInfo.fieldRequired.video_type}class="glm-required"{/if}>Video Type:</th>
+        <div id="glm-table-video" class="glm-admin-table">
+            <div class="glm-row" style="display:none">
+                <h4 {if $memberInfo.fieldRequired.video_type}class="glm-required"{/if}>Video Type:</h4>
                 <td {if $memberInfo.fieldFail.video_type}class="glm-form-bad-input" data-tabid="glm-member-info-video"{/if}>
                     <select id="glm-video-type" name="video_type">
         {foreach from=$memberInfo.fieldData.video_type.list item=v}
@@ -11,17 +11,17 @@
                     </select>
                     {if $memberInfo.fieldFail.video_type}<p>{$memberInfo.fieldFail.video_type}</p>{/if}
                 </td>
-            </tr>
-            <tr id="glm-video-url" class="glm-hidden">
-                <th {if $memberInfo.fieldRequired.video_url}class="glm-required"{/if}>Video URL:</th>
+            </div>
+            <div class="glm-row" id="glm-video-url" class="glm-hidden">
+                <h4 {if $memberInfo.fieldRequired.video_url}class="glm-required"{/if}>Video URL:</h4>
                 <td {if $memberInfo.fieldFail.video_url}class="glm-form-bad-input" data-tabid="glm-member-info-video"{/if}>
                     <input type="text" name="video_url" value="{$memberInfo.fieldData.video_url}" class="glm-form-text-input-medium" placeholder="ex: https://www.youtube.com/watch?v=C0DPdy98e4c">
                     {if $memberInfo.fieldFail.video_url}<p>{$memberInfo.fieldFail.video_url}</p>{/if}
                      <span id="video-url-msg">Only YouTube and Vimeo links are supported</span>
                 </td>
-            </tr>
-            <tr id="glm-video-file" class="glm-hidden">
-                <th {if $memberInfo.fieldRequired.video_file}class="glm-required"{/if}>Video File:</th>
+            </div>
+            <div class="glm-row" id="glm-video-file" class="glm-hidden">
+                <h4 {if $memberInfo.fieldRequired.video_file}class="glm-required"{/if}>Video File:</h4>
                 <td {if $memberInfo.fieldFail.video_file}class="glm-form-bad-input"{/if}>
         {if $memberInfo.fieldData.video_file}
                     <b>File Name:</b> {$memberInfo.fieldData.video_file}<br>
@@ -31,17 +31,17 @@
                     <b>New file:</b> <input type="file" name="video_file_new">
         {/if}
                 </td>
-            </tr>
-            <tr>
-                <th {if $memberInfo.fieldRequired.video_title}class="glm-required"{/if}>Video Title:</th>
+            </div>
+            <div class="glm-row">
+                <h4 {if $memberInfo.fieldRequired.video_title}class="glm-required"{/if}>Video Title:</h4>
                 <td {if $memberInfo.fieldFail.video_title}class="glm-form-bad-input" data-tabid="glm-member-info-video"{/if}>
                     <input type="text" name="video_title" value="{$memberInfo.fieldData.video_title}" class="glm-form-text-input-medium glm-char-count" data-msgArea="video-title-msg" maxlength="80">
                     {if $memberInfo.fieldFail.video_title}<p>{$memberInfo.fieldFail.video_title}</p>{/if}<br>
                     <span id="video-title-msg"></span>
                 </td>
-            </tr>
-            <tr>
-                <th {if $memberInfo.fieldRequired.video_descr}class="glm-required"{/if}>Video Description:</th>
+            </div>
+            <div class="glm-row">
+                <h4 {if $memberInfo.fieldRequired.video_descr}class="glm-required"{/if}>Video Description:</h4>
                 <td {if $memberInfo.fieldFail.video_descr}class="glm-form-bad-input" data-tabid="glm-member-info-video"{/if}>
                     {php} 
                         wp_editor('{$memberInfo.fieldData.video_descr|escape:quotes}', 'glm_video_descr', array(
@@ -55,5 +55,5 @@
                     {/php}
                     {if $memberInfo.fieldFail.video_descr}<p>{$memberInfo.fieldFail.video_descr}</p>{/if}
                 </td>
-            </tr>
-        </table>
+            </div>
+        </div>
diff --git a/views/admin/member/memberInfo/editProfile.html b/views/admin/member/memberInfo/editProfile.html
index d98e4a1b..a6c260f6 100644
--- a/views/admin/member/memberInfo/editProfile.html
+++ b/views/admin/member/memberInfo/editProfile.html
@@ -1,27 +1,50 @@
         
-        <table id="glm-table-profile" class="glm-admin-table glm-hidden glm-member-info-table">
-            <tr>
-                <td>
-                    {include file='admin/member/memberInfo/editProfileDescription.html'}
-                    
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    {include file='admin/member/memberInfo/editProfileAddress.html'}
-                </td>
-            </tr>
-
-            <tr>
-                <td>
-                    {include file='admin/member/memberInfo/editProfileLocation.html'}
-                </td>
-            </tr>
-            
-            <tr>
-                <td>
-                    {include file='admin/member/memberInfo/editProfileMailing.html'}
-                </td>
-                
-            </tr>
-        </table>
+        <div id="glm-table-profile" class="glm-admin-table glm-hidden glm-member-info-table">
+            <div class="glm-row">
+                <div>
+                    {include file='admin/member/memberInfo/editProfileStatus.html'}
+                </div>
+            </div>
+            <div class="glm-row">
+                <div class="glm-small-12 glm-medium-6 glm-left">
+                    <div class="glm-row">
+                        <div class="glm-small-12">
+                            {include file='admin/member/memberInfo/editProfileAddress.html'}
+                        </div>
+                        <br>
+                        <div class="glm-small-12">
+                            {include file='admin/member/memberInfo/editProfileMailing.html'}
+                        </div>
+                    </div>
+                </div>
+                <div class="glm-small-12 glm-medium-6 glm-left">
+                    <div class="glm-row">
+                        <div class="glm-small-12">
+                            {include file='admin/member/memberInfo/editProfileContact.html'}
+                        </div>
+                        <br>
+                        <div class="glm-small-12">
+                            {include file='admin/member/memberInfo/editProfileDescription.html'}
+                        </div>
+                    </div>
+                </div>
+            </div>
+<!--            <div class="glm-row">
+                <div class="glm-small-12 glm-medium-6 glm-left">
+                    profileAddress
+                </div>
+                <div class="glm-small-12 glm-medium-6 glm-left">
+                    profileContact
+                </div>
+            </div>
+            <br>
+            <div class="glm-row">
+                <div class="glm-small-12 glm-medium-6 glm-left">
+                    profileMailing
+                </div>
+                <div class="glm-small-12 glm-medium-6 glm-left">
+                    profileDescription
+                </div>
+            </div>-->
+           
+        </div>
\ No newline at end of file
diff --git a/views/admin/member/memberInfo/editProfileAddress.html b/views/admin/member/memberInfo/editProfileAddress.html
index 26038522..416edf4e 100644
--- a/views/admin/member/memberInfo/editProfileAddress.html
+++ b/views/admin/member/memberInfo/editProfileAddress.html
@@ -1,42 +1,43 @@
 <br>
-                    <h2>Address</h2>
-                    <table>
-                        <tr>
-                            <th {if $memberInfo.fieldRequired.addr1}class="glm-required"{/if}>Address 1:</th>
-                            <td {if $memberInfo.fieldFail.addr1}class="glm-form-bad-input" data-tabid="glm-member-info-address"{/if}>
-                                <input type="text" id="addr1" name="addr1" value="{$memberInfo.fieldData.addr1}" class="glm-form-text-input">
+                <h2>Address</h2>
+                <div class="glm-admin-table glm-admin-inner-table-wrapper">
+                    <div class="glm-admin-table glm-admin-inner-table">
+                        <div class="glm-row">
+                            <h4 {if $memberInfo.fieldRequired.addr1}class="glm-required"{/if}>Address 1:</h4>
+                            <div class="glm-small-12" {if $memberInfo.fieldFail.addr1}class="glm-form-bad-input" data-tabid="glm-member-info-address"{/if}>
+                                <input type="text" id="addr1" name="addr1" value="{$memberInfo.fieldData.addr1}" class="glm-form-text-input-medium-short">
                                 {if $memberInfo.fieldFail.addr1}<p>{$memberInfo.fieldFail.addr1}</p>{/if}
-                            </td>
-                        </tr>
-                        <tr>
-                            <th {if $memberInfo.fieldRequired.addr2}class="glm-required"{/if}>Address 2:</th>
-                            <td {if $memberInfo.fieldFail.addr2}class="glm-form-bad-input" data-tabid="glm-member-info-address"{/if}>
-                                <input id="addr2" type="text" name="addr2" value="{$memberInfo.fieldData.addr2}" class="glm-form-text-input">
+                            </div>
+                        </div>
+                        <div class="glm-row">
+                            <h4 {if $memberInfo.fieldRequired.addr2}class="glm-required"{/if}>Address 2:</h4>
+                            <div class="glm-small-12" {if $memberInfo.fieldFail.addr2}class="glm-form-bad-input" data-tabid="glm-member-info-address"{/if}>
+                                <input id="addr2" type="text" name="addr2" value="{$memberInfo.fieldData.addr2}" class="glm-form-text-input-medium-short">
                                 {if $memberInfo.fieldFail.addr2}<p>{$memberInfo.fieldFail.addr2}</p>{/if}
-                            </td>
-                        </tr>
-                        <tr>
-                            <th>City</th>
-                            <td class="glm-item-container">
+                            </div>
+                        </div>
+                        <div class="glm-row">
+                            <h4>City</h4>
+                            <div class="glm-small-12" class="glm-item-container">
                                 <!--  Add new city dialog -->
-                                <div id="newCityButton" class="button button-secondary glm-right">Add a new City</div>
+                                <div id="newCityButton" class="button button-secondary">Add a new City</div>
                                 <div id="newCityDialog" class="glm-dialog-box" title="Enter a New City">
-                                    <table class="glm-admin-table">
-                                        <tr>
-                                            <th class="glm-required">City Name:</th>
-                                            <td id="newCityNameTD">
+                                    <div class="glm-admin-table">
+                                        <div class="glm-row">
+                                            <h4 class="glm-required">City Name:</h4>
+                                            <div class="glm-small-12" id="newCityNameTD">
                                                 <input id="newCityName" type="text" name="newCityName" class="glm-form-text-input">
                                                 <div id="newCityNameRequired"></div>
-                                            </td>
-                                        </tr>
-                                    </table>
+                                            </div>
+                                        </div>
+                                    </div>
                                     <p><span class="glm-required">*</span> Required</p>
                                     <a id="newCityCancel" class="button button-primary glm-right">Cancel</a>
                                     <input id="newCitySubmit" type="submit" value="Add new City">
                                 </div>
                                 <!-- City Selection -->
                                 <input id="cityName" type="hidden" name="newCityName" value=""><!-- this field is only used if adding a new city to pass the new name -->
-                                <select name="city" id="city">
+                                <select name="city" id="city" class="glm-left">
                                     <option value="0"></option>
                     {foreach from=$memberInfo.fieldData.city.list item=v}
                                     <option value="{$v.value}"{if $v.default} selected="selected"{/if}>
@@ -44,11 +45,11 @@
                                     </option>
                     {/foreach}
                                 </select>
-                            </td>
-                        </tr>
-                        <tr>
-                            <th {if $memberInfo.fieldRequired.state}class="glm-required"{/if}>State:</th>
-                            <td {if $memberInfo.fieldFail.state}class="glm-form-bad-input" data-tabid="glm-member-info-address"{/if}>
+                            </div>
+                        </div>
+                        <div class="glm-row">
+                            <h4 {if $memberInfo.fieldRequired.state}class="glm-required"{/if}>State:</h4>
+                            <div class="glm-small-12" {if $memberInfo.fieldFail.state}class="glm-form-bad-input" data-tabid="glm-member-info-address"{/if}>
                                 <select id="state" name="state">
                     {foreach from=$memberInfo.fieldData.state.list item=v}
                                     <option value="{$v.value}"{if $memberInfo.fieldData.state.value == $v.value} selected="selected"{/if}>
@@ -57,18 +58,18 @@
                     {/foreach}
                                 </select>
                                 {if $memberInfo.fieldFail.state}<p>{$memberInfo.fieldFail.state}</p>{/if}
-                            </td>
-                        </tr>
-                        <tr>
-                            <th {if $memberInfo.fieldRequired.zip}class="glm-required"{/if}>ZIP / Postal Code:</th>
-                            <td {if $memberInfo.fieldFail.zip}class="glm-form-bad-input" data-tabid="glm-member-info-address"{/if}>
+                            </div>
+                        </div>
+                        <div class="glm-row">
+                            <h4 {if $memberInfo.fieldRequired.zip}class="glm-required"{/if}>ZIP / Postal Code:</h4>
+                            <div class="glm-small-12" {if $memberInfo.fieldFail.zip}class="glm-form-bad-input" data-tabid="glm-member-info-address"{/if}>
                                 <input id="zip" type="text" name="zip" value="{$memberInfo.fieldData.zip}" class="glm-form-text-input-short">
                                 {if $memberInfo.fieldFail.zip}<p>{$memberInfo.fieldFail.zip}</p>{/if}
-                            </td>
-                        </tr>
-                        <tr>
-                            <th {if $memberInfo.fieldRequired.country}class="glm-required"{/if}>Country:</th>
-                            <td {if $memberInfo.fieldFail.country}class="glm-form-bad-input" data-tabid="glm-member-info-address"{/if}>
+                            </div>
+                        </div>
+                        <div class="glm-row">
+                            <h4 {if $memberInfo.fieldRequired.country}class="glm-required"{/if}>Country:</h4>
+                            <div class="glm-small-12" {if $memberInfo.fieldFail.country}class="glm-form-bad-input" data-tabid="glm-member-info-address"{/if}>
                                 <select id="country" name="country">
                     {foreach from=$memberInfo.fieldData.country.list item=v}
                                     <option value="{$v.value}"{if $v.default} selected="selected"{/if}>
@@ -77,58 +78,39 @@
                     {/foreach}
                                 </select>
                                 {if $memberInfo.fieldFail.country}<p>{$memberInfo.fieldFail.country}</p>{/if}
-                            </td>
-                        </tr>
-                                                <tr>
-                            <th {if $memberInfo.fieldRequired.phone}class="glm-required"{/if}>Phone #:</th>
-                            <td {if $memberInfo.fieldFail.phone}class="glm-form-bad-input" data-tabid="glm-member-info-contact"{/if}>
-                                <input type="text" name="phone" value="{$memberInfo.fieldData.phone}" class="glm-form-text-input-short glm-phone-input" >
-                                {if $memberInfo.fieldFail.phone}<p>{$memberInfo.fieldFail.phone}</p>{/if}
-                            </td>
-                        </tr>
-                        <tr>
-                            <th {if $memberInfo.fieldRequired.toll_free}class="glm-required"{/if}>Toll Free #:</th>
-                            <td {if $memberInfo.fieldFail.toll_free}class="glm-form-bad-input" data-tabid="glm-member-info-contact"{/if}>
-                                <input type="text" name="toll_free" value="{$memberInfo.fieldData.toll_free}" class="glm-form-text-input-short glm-phone-input" placeholder="ex: 800.123.4567 [ext 123]">
-                                {if $memberInfo.fieldFail.toll_free}<p>{$memberInfo.fieldFail.toll_free}</p>{/if}
-                            </td>
-                        </tr>
-                        <tr>
-                            <th {if $memberInfo.fieldRequired.email}class="glm-required"{/if}>E-Mail Address:</th>
-                            <td {if $memberInfo.fieldFail.email}class="glm-form-bad-input" data-tabid="glm-member-info-contact"{/if}>
-                                <input type="text" name="email" value="{$memberInfo.fieldData.email}" class="glm-form-text-input-short" placeholder="ex: info@gaslightmedia.com">
-                                {if $memberInfo.fieldFail.email}<p>{$memberInfo.fieldFail.email}</p>{/if}
-                            </td>
-                        </tr>
-                        <tr>
-                            <th {if $memberInfo.fieldRequired.url}class="glm-required"{/if}>Web Address (URL):</th>
-                            <td {if $memberInfo.fieldFail.url}class="glm-form-bad-input" data-tabid="glm-member-info-contact"{/if}>
-                            {if $memberInfo.fieldData.url}
-                                <a class="button button-secondary glm-right" href="{$memberInfo.fieldData.url}" target="urlTarget">Test Link</a>
-                            {/if}
-                                <input type="text" name="url" value="{$memberInfo.fieldData.url}" class="glm-form-text-input-medium" placeholder="ex: http://www.gaslightmedia.com">
-                                {if $memberInfo.fieldFail.url}<p>{$memberInfo.fieldFail.url}</p>{/if}
-                            </td>
-                        </tr>
-                        <tr>
-                            <th {if $memberInfo.fieldRequired.reservation_url}class="glm-required"{/if}>Reservation URL:</th>
-                            <td {if $memberInfo.fieldFail.reservation_url}class="glm-form-bad-input" data-tabid="glm-member-reservation-url"{/if}>
-                            {if $memberInfo.fieldData.reservation_url}
-                                <a class="button button-secondary glm-right" href="{$memberInfo.fieldData.reservation_url}" target="urlTarget">Test Link</a>
-                            {/if}
-                                <input type="text" name="reservation_url" value="{$memberInfo.fieldData.reservation_url}" class="glm-form-text-input-medium" placeholder="ex: http://www.gaslightmedia.com">
-                                {if $memberInfo.fieldFail.reservation_url}<p>{$memberInfo.fieldFail.reservation_url}</p>{/if}
-                            </td>
-                        </tr>
-                        <tr>
-                            <th {if $memberInfo.fieldRequired.region}class="glm-required"{/if}>Region:</th>
-                            <td {if $memberInfo.fieldFail.region}class="glm-form-bad-input" data-tabid="glm-member-info-address"{/if}>
+                            </div>
+                        </div>
+                        <div class="glm-row">
+                            <h4 {if $memberInfo.fieldRequired.region}class="glm-required"{/if}>Region:</h4>
+                            <div class="glm-small-12" {if $memberInfo.fieldFail.region}class="glm-form-bad-input" data-tabid="glm-member-info-address"{/if}>
                                 <select name="region">
                     {foreach from=$memberInfo.fieldData.region.list item=v}
                                     <option value="{$v.value}"{if $v.default} selected="selected"{/if}>{$v.name}</option>
                     {/foreach}
                                 </select>
                                 {if $memberInfo.fieldFail.region}<p>{$memberInfo.fieldFail.region}</p>{/if}
-                            </td>
-                        </tr>
-                    </table>
\ No newline at end of file
+                            </div>
+                        </div>
+                                                <div class="glm-row">
+                            {if $memberInfo.fieldRequired.lat}<h4 class="emRequiredInputField">{else}<h4>{/if}Location:</h4>
+                            <div class="glm-small-12">
+                                <div id="glm-estimate-location" class="button button-secondary glm-left">Map Location Using Above Address</div>
+                                <div id="locationMapToggle" class="button button-secondary glm-right">View Map</div>
+                                <div id="locationMapContainer" style="height: 0;">
+                                    <p>
+                                        AP USE: Drag the pointer to the desired location for this {$terms.term_member}.
+                                        Use + and - buttons or the mouse wheel to zoom in or out.
+                                        Click and drag anywhere else on the map to move to another area.
+                                    </p>
+                                    <div id="locationMap" class="glm-map-edit-small">(map loads here)</div>
+                                </div>
+                                <p>
+                                    <b>Selected Position:</b> 
+                                    &nbsp;&nbsp;Latitude <input id="glmLat" name="lat" type="text" value="{$memberInfo.fieldData.lat}" class="glm-form-text-input-veryshort">
+                                    &nbsp;&nbsp;Longitude <input id="glmLng" name="lon" type="text" value="{$memberInfo.fieldData.lon}" class="glm-form-text-input-veryshort">
+                                    &nbsp;&nbsp;<span id="latLonRecenter" class="button button-secondary">Update pointer with new lat/lon postion.</span>
+                                </p>
+                            </div>
+                        </div>
+                    </div>
+                </div>
\ No newline at end of file
diff --git a/views/admin/member/memberInfo/editProfileContact.html b/views/admin/member/memberInfo/editProfileContact.html
new file mode 100644
index 00000000..65dbaf82
--- /dev/null
+++ b/views/admin/member/memberInfo/editProfileContact.html
@@ -0,0 +1,48 @@
+                <br>
+                <h2>Contact Info for Website</h2>
+                <div class="glm-admin-table glm-admin-inner-table-wrapper">
+                    <div class="glm-admin-table glm-admin-inner-table">
+                        
+                        <div class="glm-row">
+                            <h4 {if $memberInfo.fieldRequired.phone}class="glm-required"{/if}>Phone #:</h4>
+                            <div class="glm-small-12" {if $memberInfo.fieldFail.phone}class="glm-form-bad-input" data-tabid="glm-member-info-contact"{/if}>
+                                <input type="text" name="phone" value="{$memberInfo.fieldData.phone}" class="glm-form-text-input-short glm-phone-input" >
+                                {if $memberInfo.fieldFail.phone}<p>{$memberInfo.fieldFail.phone}</p>{/if}
+                            </div>
+                        </div>
+                        <div class="glm-row">
+                            <h4 {if $memberInfo.fieldRequired.toll_free}class="glm-required"{/if}>Toll Free #:</h4>
+                            <div class="glm-small-12" {if $memberInfo.fieldFail.toll_free}class="glm-form-bad-input" data-tabid="glm-member-info-contact"{/if}>
+                                <input type="text" name="toll_free" value="{$memberInfo.fieldData.toll_free}" class="glm-form-text-input-short glm-phone-input" placeholder="ex: 800.123.4567 [ext 123]">
+                                {if $memberInfo.fieldFail.toll_free}<p>{$memberInfo.fieldFail.toll_free}</p>{/if}
+                            </div>
+                        </div>
+                        <div class="glm-row">
+                            <h4 {if $memberInfo.fieldRequired.email}class="glm-required"{/if}>E-Mail Address:</h4>
+                            <div class="glm-small-12" {if $memberInfo.fieldFail.email}class="glm-form-bad-input" data-tabid="glm-member-info-contact"{/if}>
+                                <input type="text" name="email" value="{$memberInfo.fieldData.email}" class="glm-form-text-input-short" placeholder="ex: info@gaslightmedia.com">
+                                {if $memberInfo.fieldFail.email}<p>{$memberInfo.fieldFail.email}</p>{/if}
+                            </div>
+                        </div>
+                        <div class="glm-row">
+                            <h4 {if $memberInfo.fieldRequired.url}class="glm-required"{/if}>Web Address (URL):</h4>
+                            <div class="glm-small-12" {if $memberInfo.fieldFail.url}class="glm-form-bad-input" data-tabid="glm-member-info-contact"{/if}>
+                            {if $memberInfo.fieldData.url}
+                                <a class="button button-secondary glm-right" href="{$memberInfo.fieldData.url}" target="urlTarget">Test Link</a>
+                            {/if}
+                                <input type="text" name="url" value="{$memberInfo.fieldData.url}" class="glm-form-text-input-medium-short" placeholder="ex: http://www.gaslightmedia.com">
+                                {if $memberInfo.fieldFail.url}<p>{$memberInfo.fieldFail.url}</p>{/if}
+                            </div>
+                        </div>
+                        <div class="glm-row">
+                            <h4 {if $memberInfo.fieldRequired.reservation_url}class="glm-required"{/if}>Reservation URL:</h4>
+                            <div class="glm-small-12" {if $memberInfo.fieldFail.reservation_url}class="glm-form-bad-input" data-tabid="glm-member-reservation-url"{/if}>
+                            {if $memberInfo.fieldData.reservation_url}
+                                <a class="button button-secondary glm-right" href="{$memberInfo.fieldData.reservation_url}" target="urlTarget">Test Link</a>
+                            {/if}
+                                <input type="text" name="reservation_url" value="{$memberInfo.fieldData.reservation_url}" class="glm-form-text-input-medium-short" placeholder="ex: http://www.gaslightmedia.com">
+                                {if $memberInfo.fieldFail.reservation_url}<p>{$memberInfo.fieldFail.reservation_url}</p>{/if}
+                            </div>
+                        </div>
+                    </div>
+                </div>
\ No newline at end of file
diff --git a/views/admin/member/memberInfo/editProfileDescription.html b/views/admin/member/memberInfo/editProfileDescription.html
index a52d95ec..89a78b9f 100644
--- a/views/admin/member/memberInfo/editProfileDescription.html
+++ b/views/admin/member/memberInfo/editProfileDescription.html
@@ -1,7 +1,16 @@
-                    <table>
-                        <tr>
-                            <th {if $memberInfo.fieldRequired.descr}class="glm-required"{/if}><h2>Description:</h2></th>
-                            <td {if $memberInfo.fieldFail.descr}class="glm-form-bad-input" data-tabid="glm-member-info-descr"{/if}>
+                    <h2>Description</h2>               
+                    <div class="glm-admin-table glm-admin-inner-table">
+                        <div class="glm-row">
+                            <h4 {if $memberInfo.fieldRequired.short_descr}class="glm-required"{/if}>Short Description:</h4>
+                            <div class="glm-small-12" {if $memberInfo.fieldFail.short_descr}class="glm-form-bad-input" data-tabid="glm-member-info-descr"{/if}>
+                                <input type="text" name="short_descr" value="{$memberInfo.fieldData.short_descr}" class="glm-form-text-input glm-char-count" data-msgArea="short-descr-msg" maxlength="120" placeholder="A short, one line, description of the {$terms.term_member}.">
+                                <br><span id="short-descr-msg"></span>
+                                {if $memberInfo.fieldFail.short_descr}<p>{$memberInfo.fieldFail.short_descr}</p>{/if}
+                            </div>
+                        </div>
+                        <div class="glm-row">
+                            <h4 {if $memberInfo.fieldRequired.descr}class="glm-required"{/if}>Full Description</h4>
+                            <div class="glm-small-12" {if $memberInfo.fieldFail.descr}class="glm-form-bad-input" data-tabid="glm-member-info-descr"{/if}>
                                 {php} 
                                     wp_editor('{$memberInfo.fieldData.descr|escape:quotes}', 'glm_descr', array(
                                         'media_buttons' => false,
@@ -13,14 +22,6 @@
                                     ));
                                 {/php}
                                 {if $memberInfo.fieldFail.descr}<p>{$memberInfo.fieldFail.descr}</p>{/if}
-                            </td>
-                        </tr>
-                        <tr>
-                            <th {if $memberInfo.fieldRequired.short_descr}class="glm-required"{/if}>Short Description:</th>
-                            <td {if $memberInfo.fieldFail.short_descr}class="glm-form-bad-input" data-tabid="glm-member-info-descr"{/if}>
-                                <input type="text" name="short_descr" value="{$memberInfo.fieldData.short_descr}" class="glm-form-text-input glm-char-count" data-msgArea="short-descr-msg" maxlength="120" placeholder="A short, one line, description of the {$terms.term_member}.">
-                                <br><span id="short-descr-msg"></span>
-                                {if $memberInfo.fieldFail.short_descr}<p>{$memberInfo.fieldFail.short_descr}</p>{/if}
-                            </td>
-                        </tr>
-                    </table>
\ No newline at end of file
+                            </div>
+                        </div>
+                    </div>
\ No newline at end of file
diff --git a/views/admin/member/memberInfo/editProfileLocation.html b/views/admin/member/memberInfo/editProfileLocation.html
index 0dc49a0f..312e7361 100644
--- a/views/admin/member/memberInfo/editProfileLocation.html
+++ b/views/admin/member/memberInfo/editProfileLocation.html
@@ -1,20 +1,4 @@
-                    <table>
-                        <tr>
-                            {if $memberInfo.fieldRequired.lat}<th class="emRequiredInputField">{else}<th>{/if}Location:</th>
-                            <td>
-                                <div id="glm-estimate-location" class="button button-secondary">Map Location Using Above Address</div>
-                                <p>
-                                    AP USE: Drag the pointer to the desired location for this {$terms.term_member}.
-                                    Use + and - buttons or the mouse wheel to zoom in or out.
-                                    Click and drag anywhere else on the map to move to another area.
-                                </p>
-                                <div id="locationMap" class="glm-map-edit">(map loads here)</div>
-                                <p>
-                                    <b>Selected Position:</b> 
-                                    &nbsp;&nbsp;Latitude <input id="glmLat" name="lat" type="text" value="{$memberInfo.fieldData.lat}" class="glm-form-text-input-veryshort">
-                                    &nbsp;&nbsp;Longitude <input id="glmLng" name="lon" type="text" value="{$memberInfo.fieldData.lon}" class="glm-form-text-input-veryshort">
-                                    &nbsp;&nbsp;<span id="latLonRecenter" class="button button-secondary">Update pointer with new lat/lon postion.</span>
-                                </p>
-                            </td>
-                        </tr>
-                    </table>
\ No newline at end of file
+                    {if $memberInfo.fieldRequired.lat}<h2 class="emRequiredInputField">{else}<h2>{/if}Location:</h2>
+                    <div class="glm-admin-table glm-admin-inner-table">
+
+                    </div>
\ No newline at end of file
diff --git a/views/admin/member/memberInfo/editProfileMailing.html b/views/admin/member/memberInfo/editProfileMailing.html
index 3d1769a9..5606c6f8 100644
--- a/views/admin/member/memberInfo/editProfileMailing.html
+++ b/views/admin/member/memberInfo/editProfileMailing.html
@@ -1,42 +1,42 @@
-                    <br>
-                    <h2>Mailing</h2>
-                    <table>
+                <h2>Mailing Address</h2>
+                <div class="glm-admin-table glm-admin-inner-table-wrapper">
+                    <div class="glm-admin-table glm-admin-inner-table">
 
-                        <tr>
-                            <th {if $memberInfo.fieldRequired.mailing_addr1}class="glm-required"{/if}>Mailing Address 1:</th>
-                            <td {if $memberInfo.fieldFail.mailing_addr1}class="glm-form-bad-input" data-tabid="glm-member-info-contact"{/if}>
+                        <div class="glm-row">
+                            <h4 {if $memberInfo.fieldRequired.mailing_addr1}class="glm-required"{/if}>Mailing Address 1:</h4>
+                            <div class="glm-small-12" {if $memberInfo.fieldFail.mailing_addr1}class="glm-form-bad-input" data-tabid="glm-member-info-contact"{/if}>
                                 <input type="text" name="mailing_addr1" value="{$memberInfo.fieldData.mailing_addr1}" class="glm-form-text-input-short">
                                 {if $memberInfo.fieldFail.mailing_addr1}<p>{$memberInfo.fieldFail.mailing_addr1}</p>{/if}
-                            </td>
-                        </tr>
-                        <tr>
-                            <th {if $memberInfo.fieldRequired.mailing_addr2}class="glm-required"{/if}>Mailing Address 2:</th>
-                            <td {if $memberInfo.fieldFail.mailing_addr2}class="glm-form-bad-input" data-tabid="glm-member-info-contact"{/if}>
+                            </div>
+                        </div>
+                        <div class="glm-row">
+                            <h4 {if $memberInfo.fieldRequired.mailing_addr2}class="glm-required"{/if}>Mailing Address 2:</h4>
+                            <div class="glm-small-12" {if $memberInfo.fieldFail.mailing_addr2}class="glm-form-bad-input" data-tabid="glm-member-info-contact"{/if}>
                                 <input type="text" name="mailing_addr2" value="{$memberInfo.fieldData.mailing_addr2}" class="glm-form-text-input-short">
                                 {if $memberInfo.fieldFail.mailing_addr2}<p>{$memberInfo.fieldFail.mailing_addr2}</p>{/if}
-                            </td>
-                        </tr>
-                        <tr>
-                            <th {if $memberInfo.fieldRequired.mailing_city}class="glm-required"{/if}>Mailing City:</th>
-                            <td {if $memberInfo.fieldFail.mailing_city}class="glm-item-container glm-form-bad-input" data-tabid="glm-member-info-contact"{else}class="glm-item-container"{/if}>
+                            </div>
+                        </div>
+                        <div class="glm-row">
+                            <h4 {if $memberInfo.fieldRequired.mailing_city}class="glm-required"{/if}>Mailing City:</h4>
+                            <div class="glm-small-12" {if $memberInfo.fieldFail.mailing_city}class="glm-item-container glm-form-bad-input" data-tabid="glm-member-info-contact"{else}class="glm-item-container"{/if}>
                                 <!--  Add new city dialog -->
-                                <div id="newMailingCityButton" class="button button-secondary glm-right">Add a new City</div>
+                                <div id="newMailingCityButton" class="button button-secondary">Add a new City</div>
                                 <div id="newMailingCityDialog" class="glm-dialog-box" title="Enter a New City">
-                                    <table class="glm-admin-table">
-                                        <tr>
-                                            <th class="glm-required">City Name:</th>
-                                            <td id="newMailingCityNameTD">
+                                    <div class="glm-admin-table">
+                                        <div class="glm-row">
+                                            <h4 class="glm-required">City Name:</h4>
+                                            <div class="glm-small-12" id="newMailingCityNameTD">
                                                 <input id="newMailingCityName" type="text" name="newMailingCityName" class="glm-form-text-input">
                                                 <div id="newMailingCityNameRequired"></div>
-                                            </td>
-                                        </tr>
-                                    </table>
+                                            </div>
+                                        </div>
+                                    </div>
                                     <p><span class="glm-required">*</span> Required</p>
-                                    <a id="newMailingCityCancel" class="button button-primary glm-right">Cancel</a>
-                                    <input id="newMailingCitySubmit" type="submit" value="Add new City">
+                                    <a id="newMailingCityCancel" class="button button-primary">Cancel</a>
+                                    <input id="newMailingCitySubmit" class="glm-right" type="submit" value="Add new City">
                                 </div>
                                 <input id="mailingCityName" type="hidden" name="newMailingCityName" value=""><!-- this field is only used if adding a new mailing city to pass the new name -->
-                                <select name="mailing_city" id="mailing_city">
+                                <select name="mailing_city" id="mailing_city" class="glm-left">
                                     <option value="0"></option>
                                     {foreach from=$memberInfo.fieldData.mailing_city.list item=v}
                                         <option value="{$v.value}"{if $v.default} selected="selected"{/if}>
@@ -45,11 +45,11 @@
                                     {/foreach}
                                 </select>
                                 {if $memberInfo.fieldFail.mailing_city}<p>{$memberInfo.fieldFail.mailing_city}</p>{/if}
-                            </td>
-                        </tr>
-                        <tr>
-                            <th {if $memberInfo.fieldRequired.mailing_state}class="glm-required"{/if}>Mailing State:</th>
-                            <td {if $memberInfo.fieldFail.mailing_state}class="glm-form-bad-input" data-tabid="glm-member-info-contact"{/if}>
+                            </div>
+                        </div>
+                        <div class="glm-row">
+                            <h4 {if $memberInfo.fieldRequired.mailing_state}class="glm-required"{/if}>Mailing State:</h4>
+                            <div class="glm-small-12" {if $memberInfo.fieldFail.mailing_state}class="glm-form-bad-input" data-tabid="glm-member-info-contact"{/if}>
                                 <select id="mailing_state" name="mailing_state">
                                     <option value=""></option>
                                     {foreach from=$memberInfo.fieldData.mailing_state.list item=v}
@@ -59,14 +59,15 @@
                                     {/foreach}
                                 </select>
                                 {if $memberInfo.fieldFail.mailing_state}<p>{$memberInfo.fieldFail.mailing_state}</p>{/if}
-                            </td>
-                        </tr>
-                        <tr>
-                            <th {if $memberInfo.fieldRequired.mailing_zip}class="glm-required"{/if}>Mailing Zip:</th>
-                            <td {if $memberInfo.fieldFail.mailing_zip}class="glm-form-bad-input" data-tabid="glm-member-info-contact"{/if}>
+                            </div>
+                        </div>
+                        <div class="glm-row">
+                            <h4 {if $memberInfo.fieldRequired.mailing_zip}class="glm-required"{/if}>Mailing Zip:</h4>
+                            <div class="glm-small-12" {if $memberInfo.fieldFail.mailing_zip}class="glm-form-bad-input" data-tabid="glm-member-info-contact"{/if}>
                                 <input type="text" name="mailing_zip" value="{$memberInfo.fieldData.mailing_zip}" class="glm-form-text-input-short">
                                 {if $memberInfo.fieldFail.mailing_zip}<p>{$memberInfo.fieldFail.mailing_zip}</p>{/if}
-                            </td>
-                        </tr>
-                </table>
+                            </div>
+                        </div>
+                    </div>
+                </div>
                     
\ No newline at end of file
diff --git a/views/admin/member/memberInfo/editProfileStatus.html b/views/admin/member/memberInfo/editProfileStatus.html
new file mode 100644
index 00000000..b94c6dd0
--- /dev/null
+++ b/views/admin/member/memberInfo/editProfileStatus.html
@@ -0,0 +1,39 @@
+        <div class="glm-admin-table glm-admin-inner-table">
+            <div class="row">
+                <h2 {if $memberInfo.fieldRequired.reference_name}class="glm-required"{/if}>Profile Name:</h2>
+                <div class="glm-small-12" {if $memberInfo.fieldFail.reference_name}class="glm-form-bad-input" data-tabid="glm-member-info-descr"{/if}>
+                    <input type="text" name="reference_name" value="{$memberInfo.fieldData.reference_name}" class="glm-form-text-input-short" placeholder="Name of this {$terms.term_member} profile record for reference only. Not displayed to user.">
+                    {if $memberInfo.fieldFail.reference_name}<p>{$memberInfo.fieldFail.reference_name}</p>{/if}<br>
+                    <span class="glm-form-input-subtext">
+                        The "Profile Name" field is used to help identify this particular member
+                        profile. {$terms.term_member_plur_cap} may have multiple profiles, only one of which can be
+                        active at a time. Multiple profiles make it easy to manage separate sets
+                        of information that may be used at different times, for example seasons
+                        of the year or for special events (i.e. "Winter Profile").
+                    </span>
+                </div>
+            </div>
+            <div class="row">
+                <h2>Profile Status:</h2>
+                <div class="glm-small-12">
+                    <select name="status">
+        {foreach from=$memberInfo.fieldData.status.list item=v}
+                        <option value="{$v.value}"{if $v.default} selected{/if}>{$v.name}</option>
+        {/foreach}
+                    </select>
+                    {if $memberInfo.fieldFail.status}<p>{$memberInfo.fieldFail.status}</p>{/if}
+                </div>
+            </div>
+<!--            <div class="glm-row">
+                <h4 {if $memberInfo.fieldRequired.notes}class="glm-required"{/if}>Notes:</h4>
+                <td
+                    {if $memberInfo.fieldFail.notes}class="glm-form-bad-input" data-tabid="glm-member-info-descr"{/if}>
+                    <textarea name="notes" class="glm-form-textarea">{$memberInfo.fieldData.notes}</textarea>
+                    {if $memberInfo.fieldFail.notes}
+                    <p>{$memberInfo.fieldFail.notes}</p>{/if}<br> This
+                    "Notes" field is not displayed anywhere else. It is
+                    strictly for making and keeping notes related to this
+                    {$terms.term_member} profile.
+                </td>
+            </div>-->
+        </div>
\ No newline at end of file
diff --git a/views/admin/member/memberInfo/editStatus.html b/views/admin/member/memberInfo/editStatus.html
deleted file mode 100644
index c9d8e805..00000000
--- a/views/admin/member/memberInfo/editStatus.html
+++ /dev/null
@@ -1,37 +0,0 @@
-        
-        <table id="glm-table-status" class="glm-admin-table glm-member-info-table">
-            <tr>
-                <th {if $memberInfo.fieldRequired.reference_name}class="glm-required"{/if}>Profile Name:</th>
-                <td {if $memberInfo.fieldFail.reference_name}class="glm-form-bad-input" data-tabid="glm-member-info-descr"{/if}>
-                    <input type="text" name="reference_name" value="{$memberInfo.fieldData.reference_name}" class="glm-form-text-input" placeholder="Name of this {$terms.term_member} profile record for reference only. Not displayed to user.">
-                    {if $memberInfo.fieldFail.reference_name}<p>{$memberInfo.fieldFail.reference_name}</p>{/if}<br>
-                    The "Profile Name" field is used to help identify this particular {$terms.term_member} profile. {$terms.term_member_plur_cap} may have multiple profiles,
-                    only one of which can be active at a time. Multiple profiles make it easy to manage separate sets of information that may be 
-                    used at different times, for example seasons of the year or for special events (i.e. "Winter Profile").  
-                </td>
-            </tr>
-            <tr>
-                <th>Profile Status:</th>
-                <td>
-                    <select name="status">
-        {foreach from=$memberInfo.fieldData.status.list item=v}
-                        <option value="{$v.value}"{if $v.default} selected{/if}>{$v.name}</option>
-        {/foreach}
-                    </select>
-                    {if $memberInfo.fieldFail.status}<p>{$memberInfo.fieldFail.status}</p>{/if}
-                </td>
-            </tr>
-            <tr>
-                <th {if $memberInfo.fieldRequired.notes}class="glm-required"{/if}>Notes:</th>
-            <td
-                {if $memberInfo.fieldFail.notes}class="glm-form-bad-input" data-tabid="glm-member-info-descr"{/if}>
-                <textarea name="notes" class="glm-form-textarea">{$memberInfo.fieldData.notes}</textarea>
-                {if $memberInfo.fieldFail.notes}
-                <p>{$memberInfo.fieldFail.notes}</p>{/if}<br> This
-                "Notes" field is not displayed anywhere else. It is
-                strictly for making and keeping notes related to this
-                {$terms.term_member} profile.
-            </td>
-        </tr>
-        </table>
-        
diff --git a/views/admin/members/list.html b/views/admin/members/list.html
index 104e6963..10d90594 100644
--- a/views/admin/members/list.html
+++ b/views/admin/members/list.html
@@ -1,5 +1,5 @@
 {include file='admin/members/header.html'}
-
+<div class="glm-admin-inner-table glm-admin-table">
     <form action="{$thisUrl}?page={$thisPage}" method="post" id="searchForm">
         <input type="hidden" name="glm_action" value="list">
         <input type="hidden" name="prevStart" value="{$prevStart}">
@@ -7,27 +7,27 @@
         <input type="hidden" name="limit" value="{$limit}">
         
         <h2 class="glm-admin-table-header">List&nbsp;of&nbsp;{$terms.term_member_plur_cap}</h2>
-        <p class="">
+        <div class="glm-row">
+            <b>Text Search: </b><input  class="glmMembersSearch" type="text" name="text_search" id="autoTest">
+            <input type="submit" value="Submit" style="margin-right: 2em;">
+        </div>
 <!--                <th>{$terms.term_member_plur_cap} Found:</th><td><span style="margin-right: 2em;">{$memberCount}</span></td> -->
-        <div>        <b>Categories: </b>
-                <select id="filterCategories" name="filterCategories[]" multiple="multiple" size="1">
+        <div class="glm-row">        
+            <b>Categories: </b>
+            <select id="filterCategories" name="filterCategories[]" multiple="multiple" size="1">
     {foreach from=$categories item=v}
-                        <option value="{$v.id}" data-parent="{$v.parent}"{if $v.selected} selected{/if}>
-                            {if $v.parent_id}&nbsp;&nbsp;&nbsp;&nbsp;{/if}{$v.name}
-                        </option>
+                <option value="{$v.id}" data-parent="{$v.parent}"{if $v.selected} selected{/if}>
+                    {if $v.parent_id}&nbsp;&nbsp;&nbsp;&nbsp;{/if}{$v.name}
+                </option>
     {/foreach}
-                </select>
-                <input type="submit" value="Submit" style="margin-right: 2em;"></div>
-        <div>
-            <b>Text Search: </b><input  class="glmMembersSearch" type="text" name="text_search" id="autoTest">
+            </select>
         </div>
-        <div>
+
+        <div class="glm-row">
             <b>Show Archived: </b><input type="checkbox" id="filterArchived" class="listFilter"{if $filterArchived} checked{/if} style="margin-right: 1em;">
                 <b>Featured Only: </b><input type="checkbox" id="filterFeatured" class="listFilter"{if $filterFeatured} checked{/if} style="margin-right: 1em;">
                 <b>Pending Only: </b><input type="checkbox" id="filterPending" class="listFilter"{if $filterPending} checked{/if} style="margin-right: 1em;">
         </div>
-                
-       </p>
 
         <p><b>Total found:</b> {$memberCount}&nbsp;&nbsp;</p>
 
@@ -47,7 +47,7 @@
                     <th>{$terms.term_member_cap} Name</th>
                     <th>Featured</th>
                     <th>Access</th>
-                    <th>{$terms.term_member_cap} Type</th>
+<!--                    <th>$terms.term_member_cap Type</th>-->
                 </tr>
             </thead>
             <tbody>
@@ -72,11 +72,11 @@
                     <td>
                         {$m.access_short.name}
                     </td>
+<!--                    <td>
+                        $m.member_type_short
+                    </td>-->
                     <td>
-                        {$m.member_type_short}
-                    </td>
-                    <td>
-                        <a href="{$siteBaseUrl}{$settings.canonical_member_page}/{$m.member_slug}/" target="_blank">View Member</a>
+                        <a href="{$siteBaseUrl}{$settings.canonical_member_page}/{$m.member_slug}/" target="_blank">View {$terms.term_member_cap}</a>
                     </td>
                 </tr>
         {/foreach}
@@ -162,7 +162,7 @@
             <input type="submit" value="Export" class="button button-primary">
         </form>
     </div>
-
+</div>
     <script type="text/javascript">
         jQuery(document).ready(function($) {
 
diff --git a/views/admin/pages/shortcode.html b/views/admin/pages/shortcode.html
index 530b0e71..32ca3570 100644
--- a/views/admin/pages/shortcode.html
+++ b/views/admin/pages/shortcode.html
@@ -2,7 +2,7 @@
     <div id="shortcodeBuilder">
         <select id="shortcodeDropdown" class="shortcodeDropdown">
             <option value=""> Select Shortcode </option>
-            <option value = "glm-members-list">Display Member List by Category</option>
+            <option value = "glm-members-list">Display {$terms.term_member_plur_cap} List by Category</option>
         </select>
         <select id="category-scDropdown" name="category-scDropdown[]">
             <option disabled> Select Category </option>