diff --git a/embark-ui/src/components/ExplorerLayout.js b/embark-ui/src/components/ExplorerLayout.js
index d322b3fa..ba3975b5 100644
--- a/embark-ui/src/components/ExplorerLayout.js
+++ b/embark-ui/src/components/ExplorerLayout.js
@@ -8,21 +8,17 @@ import BlockContainer from '../containers/BlockContainer';
 import TransactionsContainer from '../containers/TransactionsContainer';
 import TransactionContainer from '../containers/TransactionContainer';
 
-class ExplorerLayout extends React.Component {
-  render() {
-    return (
-      <React.Fragment>
-        <Switch>
-          <Route exact path="/embark/explorer/accounts" component={AccountsContainer}/>
-          <Route exact path="/embark/explorer/accounts/:address" component={AccountContainer}/>
-          <Route exact path="/embark/explorer/blocks" component={BlocksContainer}/>
-          <Route exact path="/embark/explorer/blocks/:blockNumber" component={BlockContainer}/>
-          <Route exact path="/embark/explorer/transactions" component={TransactionsContainer}/>
-          <Route exact path="/embark/explorer/transactions/:hash" component={TransactionContainer}/>
-        </Switch>
-      </React.Fragment>
-    );
-  }
-}
+const ExplorerLayout = () => (
+  <React.Fragment>
+    <Switch>
+      <Route exact path="/embark/explorer/accounts" component={AccountsContainer}/>
+      <Route exact path="/embark/explorer/accounts/:address" component={AccountContainer}/>
+      <Route exact path="/embark/explorer/blocks" component={BlocksContainer}/>
+      <Route exact path="/embark/explorer/blocks/:blockNumber" component={BlockContainer}/>
+      <Route exact path="/embark/explorer/transactions" component={TransactionsContainer}/>
+      <Route exact path="/embark/explorer/transactions/:hash" component={TransactionContainer}/>
+    </Switch>
+  </React.Fragment>
+);
 
 export default ExplorerLayout;
diff --git a/embark-ui/src/components/Layout.js b/embark-ui/src/components/Layout.js
index 6dfdbe08..e5bff8e5 100644
--- a/embark-ui/src/components/Layout.js
+++ b/embark-ui/src/components/Layout.js
@@ -130,7 +130,9 @@ class Layout extends React.Component {
   renderRightNav() {
     return (<Nav className="ml-auto" navbar>
       {<SearchBar hidden={this.state.searchLoading} searchSubmit={searchValue => this.searchTheExplorer(searchValue)}/>}
-      {this.state.searchLoading && <p className="search-loading">Searching... <FontAwesome name="spinner" spin /></p>}
+      {this.state.searchLoading && <p className="search-loading">
+        Searching... <FontAwesome name="spinner" size="2x" spin className="align-middle ml-2"/>
+      </p>}
 
       {this.renderSettings()}
     </Nav>);
diff --git a/embark-ui/src/components/Loading.js b/embark-ui/src/components/Loading.js
index 97cb0301..a03ad9b6 100644
--- a/embark-ui/src/components/Loading.js
+++ b/embark-ui/src/components/Loading.js
@@ -7,7 +7,7 @@ import "./Loading.css";
 const Loading = () => (
   <Row className="align-items-center mt-5">
     <Col className="text-center">
-      <FontAwesome name="spinner" spin className="fa-3x fa-fw" />
+      <FontAwesome name="spinner" spin size="3x" />
     </Col>
   </Row>
 );
diff --git a/embark-ui/src/components/SearchBar.js b/embark-ui/src/components/SearchBar.js
index 137e86c1..4ab27dc6 100644
--- a/embark-ui/src/components/SearchBar.js
+++ b/embark-ui/src/components/SearchBar.js
@@ -2,6 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import {Form, FormGroup, Input, Button, Row, Col} from 'reactstrap';
 import FontAwesome from 'react-fontawesome';
+import classNames from 'classnames';
 
 import './search.css';
 
@@ -33,19 +34,16 @@ class SearchBar extends React.Component {
 
   render() {
     return (
-      <Row className={this.props.hidden ? 'hidden' : ''}>
-        <Col className="col-sm-12">
-          <Form inline className="search-bar float-right my-2">
-            <FormGroup>
-              <Input type="text" name="search-bar" placeholder="Search by Address / Txhash / Block" onChange={(e) => this.onChange(e)}
-                     value={this.state.searchValue} onKeyPress={e => this.onKeyPress(e)} />
-              <Button color="secondary" onClick={(e) => this.onSubmit(e)}>
-                <FontAwesome name="search"/>
-              </Button>
-            </FormGroup>
-          </Form>
-        </Col>
-      </Row>
+      <Form inline className={classNames('search-bar', 'float-right', 'my-2', {hidden: this.props.hidden})}>
+        <FormGroup>
+          <Input type="text" name="search-bar" placeholder="Search by Address / Txhash / Block"
+                 onChange={(e) => this.onChange(e)}
+                 value={this.state.searchValue} onKeyPress={e => this.onKeyPress(e)}/>
+          <Button color="secondary" onClick={(e) => this.onSubmit(e)}>
+            <FontAwesome name="search"/>
+          </Button>
+        </FormGroup>
+      </Form>
     );
   }
 }
diff --git a/embark-ui/src/components/search.css b/embark-ui/src/components/search.css
index 332ea6f2..9ca738e2 100644
--- a/embark-ui/src/components/search.css
+++ b/embark-ui/src/components/search.css
@@ -22,12 +22,6 @@
   margin-top: 16px;
 }
 
-.search-loading .fa-spinner {
-  font-size: 2em;
-  vertical-align: middle;
-  margin-left: 10px;
-}
-
 .search-error-close {
   position: absolute;
   cursor: pointer;