diff --git a/themes/bootstrap3/templates/oai/home.phtml b/themes/bootstrap3/templates/oai/home.phtml
index eac861b64e3f2b6ceb75f958270fd96efb849716..b7e5fa82d094ae48a2ba9c8469aa2445beaf88c1 100644
--- a/themes/bootstrap3/templates/oai/home.phtml
+++ b/themes/bootstrap3/templates/oai/home.phtml
@@ -3,115 +3,198 @@
   $this->layout()->breadcrumbs = $this->transEsc('OAI Server');
   $baseUrl = $this->url('oai-server');
 ?>
-<h2><?=$this->transEsc('OAI Server')?></h2>
-<p>
-  This OAI server is OAI 2.0 compliant.<br/>
-  The OAI Server URL is: <?=$this->serverUrl($baseUrl)?>
-</p>
-
-<p class="lead"><?=$this->transEsc('Available Functionality') ?>:</p>
-<dl>
-  <dt>Identify</dt>
-  <dd>
-    <form class="form-horizontal" method="get" action="<?=$baseUrl?>">
-      <p class="help-block">Returns the Identification information of this OAI Server.</p>
-      <input type="hidden" name="verb" value="Identify"/>
-      <p class="help-block">Accepts no additional parameters.</p>
-      <input class="btn btn-default" type="submit" name="submit" value="<?=$this->transEsc('Go')?>"/>
+<div class="row">
+  <div class="col-sm-9">
+    <h2><?=$this->transEsc('OAI Server')?></h2>
+    <p>
+      This OAI server is OAI 2.0 compliant.<br/>
+      The OAI Server URL is: <?=$this->serverUrl($baseUrl)?>
+    </p>
+    <hr/>
+    <a name="Identify"></a>
+    <p class="lead">Identify</p>
+    <form method="get" action="<?=$baseUrl?>">
+      <div class="row">
+        <div class="col-sm-8">
+          <p class="help-block">Returns the Identification information of this OAI Server.</p>
+          <input type="hidden" name="verb" value="Identify"/>
+          <p class="help-block">Accepts no additional parameters.</p>
+        </div>
+        <div class="col-sm-4">
+          <input class="btn btn-default" type="submit" name="submit" value="<?=$this->transEsc('Go')?>"/>
+        </div>
+      </div>
     </form>
-  </dd>
-
-  <dt>ListIdentifiers</dt>
-  <dd>
-    <form class="form-inline" method="get" action="<?=$baseUrl?>">
-      <p class="help-block">Returns a listing of available identifiers</p>
-      <input type="hidden" name="verb" value="ListIdentifiers"/>
-      <table class="text-right">
-        <tr>
-          <td><label for="ListIdentifier_from"><?=$this->transEsc('From')?>:</label></td>
-          <td><input id="ListIdentifier_from" type="text" name="from"/></td>
-        </tr>
-        <tr>
-          <td><label for="ListIdentifier_until"><?=$this->transEsc('Until')?>:</label></td>
-          <td><input id="ListIdentifier_until" type="text" name="until"/></td>
-        </tr>
-        <tr>
-          <td><label for="ListIdentifier_set"><?=$this->transEsc('Set')?>:</label></td>
-          <td><input id="ListIdentifier_set" type="text" name="set"/></td>
-        </tr>
-        <tr>
-          <td><label for="ListIdentifier_metadataPrefix"><?=$this->transEsc('Metadata Prefix')?>:</label></td>
-          <td><input id="ListIdentifier_metadataPrefix" type="text" name="metadataPrefix"/></td>
-        </tr>
-        <tr>
-          <td><label for="ListIdentifier_resumptionToken"><?=$this->transEsc('Resumption Token')?>:</label></td>
-          <td><input id="ListIdentifier_resumptionToken" type="text" name="resumptionToken"/></td>
-        </tr>
-      </table>
-      <input class="btn btn-default" type="submit" name="submit" value="<?=$this->transEsc('Go')?>"/>
-    </form>
-  </dd>
-
-  <dt>ListMetadataFormats</dt>
-  <dd>
-    <form class="form-inline" method="get" action="<?=$baseUrl?>">
-      <p class="help-block">Returns a listing of available metadata formats.</p>
-      <input type="hidden" name="verb" value="ListMetadataFormats"/>
-      <label for="ListMetadataFormats_identifier"><?=$this->transEsc('Identifier')?>:</label> <input id="ListMetadataFormats_identifier" type="text" name="identifier"/><br/>
-      <input class="btn btn-default" type="submit" name="submit" value="<?=$this->transEsc('Go')?>"/>
-    </form>
-  </dd>
-
-  <dt>ListSets</dt>
-  <dd>
-    <form class="form-inline" method="get" action="<?=$baseUrl?>">
-      <p class="help-block">Returns a listing of available sets.</p>
-      <input type="hidden" name="verb" value="ListSets"/>
-      <label for="ListSets_metadataPrefix"><?=$this->transEsc('Metadata Prefix')?>:</label> <input id="ListSets_metadataPrefix" type="text" name="metadataPrefix"/><br class="clear"/>
-      <label for="ListSets_resumptionToken"><?=$this->transEsc('Resumption Token')?>:</label> <input id="ListSets_resumptionToken" type="text" name="resumptionToken"/><br class="clear"/>
-      <input class="btn btn-default" type="submit" name="submit" value="<?=$this->transEsc('Go')?>"/><br class="clear"/>
-    </form>
-  </dd>
-
-  <dt>ListRecords</dt>
-  <dd>
-    <form class="form-inline" method="get" action="<?=$baseUrl?>">
-      <p class="help-block">Returns a listing of available records.</p>
-      <input type="hidden" name="verb" value="ListRecords"/>
-      <table class="text-right">
-        <tr>
-          <td><label for="ListRecord_from"><?=$this->transEsc('From')?>:</label></td>
-          <td><input id="ListRecord_from" type="text" name="from"/></td>
-        </tr>
-        <tr>
-          <td><label for="ListRecord_until"><?=$this->transEsc('Until')?>:</label></td>
-          <td><input id="ListRecord_until" type="text" name="until"/></td>
-        </tr>
-        <tr>
-          <td><label for="ListRecord_set"><?=$this->transEsc('Set')?>:</label></td>
-          <td><input id="ListRecord_set" type="text" name="set"/></td>
-        </tr>
-        <tr>
-          <td><label for="ListRecord_metadataPrefix"><?=$this->transEsc('Metadata Prefix')?>:</label></td>
-          <td><input id="ListRecord_metadataPrefix" type="text" name="metadataPrefix"/></td>
-        </tr>
-        <tr>
-          <td><label for="ListRecord_resumptionToken"><?=$this->transEsc('Resumption Token')?>:</label></td>
-          <td><input id="ListRecord_resumptionToken" type="text" name="resumptionToken"/></td>
-        </tr>
-      </table>
-      <input class="btn btn-default" type="submit" name="submit" value="<?=$this->transEsc('Go')?>"/>
-    </form>
-  </dd>
-
-  <dt>GetRecord</dt>
-  <dd>
-    <form class="form-inline" method="get" action="<?=$baseUrl?>">
-      <p class="help-block">Returns a single record.</p>
-      <input type="hidden" name="verb" value="GetRecord"/>
-      <label for="GetRecord_identifier"><?=$this->transEsc('Identifier')?>:</label> <input id="GetRecord_identifier" type="text" name="identifier"/><br class="clear"/>
-      <label for="GetRecord_metadataPrefix"><?=$this->transEsc('Metadata Prefix')?>:</label> <input id="GetRecord_metadataPrefix" type="text" name="metadataPrefix"/><br class="clear"/>
-      <input class="btn btn-default" type="submit" name="submit" value="<?=$this->transEsc('Go')?>"/><br class="clear"/>
-    </form>
-  </dd>
-</dl>
\ No newline at end of file
+    <hr/>
+    <a name="ListIdentifiers"></a>
+    <p class="lead">ListIdentifiers</p>
+    <div class="row">
+      <div class="col-sm-8">
+        <form class="form-horizontal" method="get" action="<?=$baseUrl?>">
+          <input type="hidden" name="verb" value="ListIdentifiers"/>
+          <p class="help-block">Returns a listing of available identifiers</p>
+          <div class="form-group">
+            <label for="ListIdentifier_from" class="col-sm-3 control-label"><?=$this->transEsc('From')?>:</label>
+            <div class="col-sm-9">
+              <input id="ListIdentifier_from" type="text" name="from" class="form-control"/>
+            </div>
+          </div>
+          <div class="form-group">
+            <label for="ListIdentifier_until" class="col-sm-3 control-label"><?=$this->transEsc('Until')?>:</label>
+            <div class="col-sm-9">
+              <input id="ListIdentifier_until" type="text" name="until" class="form-control"/>
+            </div>
+          </div>
+          <div class="form-group">
+            <label for="ListIdentifier_set" class="col-sm-3 control-label"><?=$this->transEsc('Set')?>:</label>
+            <div class="col-sm-9">
+              <input id="ListIdentifier_set" type="text" name="set" class="form-control"/>
+            </div>
+          </div>
+          <div class="form-group">
+            <label for="ListIdentifier_metadataPrefix" class="col-sm-3 control-label"><?=$this->transEsc('Metadata Prefix')?>:</label>
+            <div class="col-sm-9">
+              <input id="ListIdentifier_metadataPrefix" type="text" name="metadataPrefix" class="form-control"/>
+            </div>
+          </div>
+          <div class="form-group">
+            <label for="ListIdentifier_resumptionToken" class="col-sm-3 control-label"><?=$this->transEsc('Resumption Token')?>:</label>
+            <div class="col-sm-9">
+              <input id="ListIdentifier_resumptionToken" type="text" name="resumptionToken" class="form-control"/>
+            </div>
+          </div>
+        </form>
+      </div>
+      <div class="col-sm-4">
+        <input class="btn btn-default" type="submit" name="submit" value="<?=$this->transEsc('Go')?>"/>
+      </div>
+    </div>
+    <hr/>
+    <a name="ListMetadataFormats"></a>
+    <p class="lead">ListMetadataFormats</p>
+    <div class="row">
+      <div class="col-sm-8">
+        <form class="form-horizontal" method="get" action="<?=$baseUrl?>">
+          <input type="hidden" name="verb" value="ListMetadataFormats"/>
+          <p class="help-block">Returns a listing of available metadata formats.</p>
+          <div class="form-group">
+            <label for="ListMetadataFormats_identifier" class="col-sm-3 control-label"><?=$this->transEsc('Identifier')?>:</label>
+            <div class="col-sm-9">
+              <input id="ListMetadataFormats_identifier" type="text" name="identifier" class="form-control"/>
+            </div>
+          </div>
+        </form>
+      </div>
+      <div class="col-sm-4">
+        <input class="btn btn-default" type="submit" name="submit" value="<?=$this->transEsc('Go')?>"/>
+      </div>
+    </div>
+    <hr/>
+    <a name="ListSets"></a>
+    <p class="lead">ListSets</p>
+    <div class="row">
+      <div class="col-sm-8">
+        <form class="form-horizontal" method="get" action="<?=$baseUrl?>">
+          <input type="hidden" name="verb" value="ListSets"/>
+          <p class="help-block">Returns a listing of available sets.</p>
+          <div class="form-group">
+            <label for="ListSets_metadataPrefix" class="col-sm-3 control-label"><?=$this->transEsc('Metadata Prefix')?>:</label>
+            <div class="col-sm-9">
+              <input id="ListSets_metadataPrefix" type="text" name="metadataPrefix" class="form-control"/>
+            </div>
+          </div>
+          <div class="form-group">
+            <label for="ListSets_resumptionToken" class="col-sm-3 control-label"><?=$this->transEsc('Resumption Token')?>:</label>
+            <div class="col-sm-9">
+              <input id="ListSets_resumptionToken" type="text" name="resumptionToken" class="form-control"/>
+            </div>
+          </div>
+        </form>
+      </div>
+      <div class="col-sm-4">
+        <input class="btn btn-default" type="submit" name="submit" value="<?=$this->transEsc('Go')?>"/>
+      </div>
+    </div>
+    <hr/>
+    <a name="ListRecords"></a>
+    <p class="lead">ListRecords</p>
+    <div class="row">
+      <div class="col-sm-8">
+        <form class="form-horizontal" method="get" action="<?=$baseUrl?>">
+          <input type="hidden" name="verb" value="ListRecords"/>
+          <p class="help-block">Returns a listing of available records.</p>
+          <div class="form-group">
+            <label for="ListRecord_from" class="col-sm-3 control-label"><?=$this->transEsc('From')?>:</label>
+            <div class="col-sm-9">
+              <input id="ListRecord_from" type="text" name="from" class="form-control"/>
+            </div>
+          </div>
+          <div class="form-group">
+            <label for="ListRecord_until" class="col-sm-3 control-label"><?=$this->transEsc('Until')?>:</label>
+            <div class="col-sm-9">
+              <input id="ListRecord_until" type="text" name="until" class="form-control"/>
+            </div>
+          </div>
+          <div class="form-group">
+            <label for="ListRecord_set" class="col-sm-3 control-label"><?=$this->transEsc('Set')?>:</label>
+            <div class="col-sm-9">
+              <input id="ListRecord_set" type="text" name="set" class="form-control"/>
+            </div>
+          </div>
+          <div class="form-group">
+            <label for="ListRecord_metadataPrefix" class="col-sm-3 control-label"><?=$this->transEsc('Metadata Prefix')?>:</label>
+            <div class="col-sm-9">
+              <input id="ListRecord_metadataPrefix" type="text" name="metadataPrefix" class="form-control"/>
+            </div>
+          </div>
+          <div class="form-group">
+            <label for="ListRecord_resumptionToken" class="col-sm-3 control-label"><?=$this->transEsc('Resumption Token')?>:</label>
+            <div class="col-sm-9">
+              <input id="ListRecord_resumptionToken" type="text" name="resumptionToken" class="form-control"/>
+            </div>
+          </div>
+        </form>
+      </div>
+      <div class="col-sm-4">
+        <input class="btn btn-default" type="submit" name="submit" value="<?=$this->transEsc('Go')?>"/>
+      </div>
+    </div>
+    <hr/>
+    <a name="GetRecord"></a>
+    <p class="lead">GetRecord</p>
+    <div class="row">
+      <div class="col-sm-8">
+        <form class="form-horizontal" method="get" action="<?=$baseUrl?>">
+          <input type="hidden" name="verb" value="GetRecord"/>
+          <p class="help-block">Returns a single record.</p>
+          <div class="form-group">
+            <label for="GetRecord_identifier" class="col-sm-3 control-label"><?=$this->transEsc('Identifier')?>:</label>
+            <div class="col-sm-9">
+              <input id="GetRecord_identifier" type="text" name="identifier" class="form-control"/>
+            </div>
+          </div>
+          <div class="form-group">
+            <label for="GetRecord_metadataPrefix" class="col-sm-3 control-label"><?=$this->transEsc('Metadata Token')?>:</label>
+            <div class="col-sm-9">
+              <input id="GetRecord_metadataPrefix" type="text" name="metadataPrefix" class="form-control"/>
+            </div>
+          </div>
+        </form>
+      </div>
+      <div class="col-sm-4">
+        <input class="btn btn-default" type="submit" name="submit" value="<?=$this->transEsc('Go')?>"/>
+      </div>
+    </div>
+  </div>
+  <div class="col-sm-3">
+    <p class="lead"><?=$this->transEsc('Available Functionality') ?>:</p>
+    <div class="list-group">
+      <a href="#Identify" class="list-group-item active">Identify</a>
+      <a href="#ListIdentifiers" class="list-group-item">ListIdentifiers</a>
+      <a href="#ListMetadataFormats" class="list-group-item">ListMetadataFormats</a>
+      <a href="#ListSets" class="list-group-item">ListSets</a>
+      <a href="#ListRecords" class="list-group-item">ListRecords</a>
+      <a href="#GetRecord" class="list-group-item">GetRecord</a>
+    </div>
+  </div>
+</div>
\ No newline at end of file