From 28a1303adf5b93a0529dd306582171acf0b29afd Mon Sep 17 00:00:00 2001
From: Jonathan Rainville <rainville.jonathan@gmail.com>
Date: Wed, 24 Oct 2018 10:52:53 -0400
Subject: [PATCH] conflict in explorer layout

---
 embark-ui/src/components/Accounts.js                | 2 +-
 embark-ui/src/components/Blocks.js                  | 2 +-
 embark-ui/src/components/ExplorerDashboardLayout.js | 2 +-
 embark-ui/src/components/Transactions.js            | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/embark-ui/src/components/Accounts.js b/embark-ui/src/components/Accounts.js
index 4f352498..e153c48b 100644
--- a/embark-ui/src/components/Accounts.js
+++ b/embark-ui/src/components/Accounts.js
@@ -10,7 +10,7 @@ const Accounts = ({accounts}) => (
     <Col>
       <Card>
         <CardHeader>
-          <h1>Accounts</h1>
+          <h2>Accounts</h2>
         </CardHeader>
         <CardBody>
           {accounts.map(account => (
diff --git a/embark-ui/src/components/Blocks.js b/embark-ui/src/components/Blocks.js
index 0e994ae3..ca63a13c 100644
--- a/embark-ui/src/components/Blocks.js
+++ b/embark-ui/src/components/Blocks.js
@@ -11,7 +11,7 @@ const Blocks = ({blocks, showLoadMore, loadMore}) => (
     <Col>
       <Card>
         <CardHeader>
-          <h1>Blocks</h1>
+          <h2>Blocks</h2>
         </CardHeader>
         <CardBody>
           {blocks.map(block => (
diff --git a/embark-ui/src/components/ExplorerDashboardLayout.js b/embark-ui/src/components/ExplorerDashboardLayout.js
index 4dcb3cf3..e510c1de 100644
--- a/embark-ui/src/components/ExplorerDashboardLayout.js
+++ b/embark-ui/src/components/ExplorerDashboardLayout.js
@@ -12,7 +12,7 @@ import './Explorer.css';
 
 const ExplorerDashboardLayout = () => (
   <React.Fragment>
-    <Row>
+    <Row className="mt-4">
       <Col>
         <AccountsContainer />
       </Col>
diff --git a/embark-ui/src/components/Transactions.js b/embark-ui/src/components/Transactions.js
index 643bf341..1e8dc643 100644
--- a/embark-ui/src/components/Transactions.js
+++ b/embark-ui/src/components/Transactions.js
@@ -11,7 +11,7 @@ const Transactions = ({transactions, showLoadMore, loadMore}) => (
     <Col>
       <Card>
         <CardHeader>
-          <h1>Transactions</h1>
+          <h2>Transactions</h2>
         </CardHeader>
         <CardBody>
           {transactions.map(transaction => (
@@ -41,7 +41,7 @@ const Transactions = ({transactions, showLoadMore, loadMore}) => (
               </Row>
             </div>
           ))}
-          {showLoadMore && <LoadMore loadMore={() => loadMore()} />}
+          {showLoadMore && <LoadMore loadMore={() => loadMore()}/>}
         </CardBody>
       </Card>
     </Col>