diff --git a/src/main/resources/static/css/main.css b/src/main/resources/static/css/main.css
index 185123b..f29cc12 100644
--- a/src/main/resources/static/css/main.css
+++ b/src/main/resources/static/css/main.css
@@ -276,4 +276,30 @@ input:focus {
     color: #f1f1f1 !important;
     background: #999999 !important;
     cursor: default !important;
-}
\ No newline at end of file
+}
+
+#historyFunction {
+    margin-top: 30px;
+    margin-bottom: 30px;
+    width: 670px;
+    display: flex;
+    align-content: space-between;
+}
+
+#historyFunction div {
+    width: 250px;
+    margin-left: 10px;
+    margin-right: 10px;
+}
+
+#historyFunction div input {
+    width: 75%;
+}
+
+#historyFunction button {
+    width: 100px;
+    margin-left: 15px;
+    margin-right: 15px;
+}
+
+
diff --git a/src/main/resources/static/html/mock.html b/src/main/resources/static/html/mock.html
index a8739a9..4614de4 100644
--- a/src/main/resources/static/html/mock.html
+++ b/src/main/resources/static/html/mock.html
@@ -91,46 +91,45 @@
                         </table>
                     </div>
                     <div id="history" style="display:none;">
+                        <div id="historyFunction">
+                            <div>
+                                <label for="historyFrom">From</label>
+                                <input type="datetime-local" name="dateFrom" id="historyFrom"/>
+                            </div>
+                            <div>
+                                <label for="historyTo">To</label>
+                                <input type="datetime-local" name="dateTo" id="historyTo"/>
+                            </div>
+                            <button id="btn-searchHistory">Search</button>
+                        </div>
+                        <div style="clear:both;"></div>
                         <div id="historyDisplay">
-                            <div>
-                                <div>
-                                    <label for="historyFrom">From</label>
-                                    <input type="datetime-local" name="dateFrom" id="historyFrom"/>
-                                </div>
-                                <div>
-                                    <label for="historyTo">To</label>
-                                    <input type="datetime-local" name="dateTo" id="historyTo"/>
-                                </div>
-                                <button id="btn-searchHistory">Search</button>
-                            </div>
-                            <div>
-                                <table id="historyTable" class="simpleTable">
-                                    <thead>
-                                        <tr class="head">
-                                            <th>Timestamp</th>
-                                            <th>Status</th>
-                                        </tr>
-                                    </thead>
-                                    <tbody>
-                                        <tr>
-                                            <td>2020-02-02 10:56:23</td>
-                                            <td>Request received</td>
-                                        </tr>
-                                        <tr>
-                                            <td>2020-02-02 10:56:23</td>
-                                            <td>Request received</td>
-                                        </tr>
-                                        <tr>
-                                            <td>2020-02-02 10:56:23</td>
-                                            <td>Request received</td>
-                                        </tr>
-                                        <tr>
-                                            <td>2020-02-02 10:56:23</td>
-                                            <td>Request received</td>
-                                        </tr>
-                                    </tbody>
-                                </table>
-                            </div>
+                            <table id="historyTable" class="simpleTable">
+                                <thead>
+                                    <tr class="head">
+                                        <th>Timestamp</th>
+                                        <th>Status</th>
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                    <tr>
+                                        <td>2020-02-02 10:56:23</td>
+                                        <td>Request received</td>
+                                    </tr>
+                                    <tr>
+                                        <td>2020-02-02 10:56:23</td>
+                                        <td>Request received</td>
+                                    </tr>
+                                    <tr>
+                                        <td>2020-02-02 10:56:23</td>
+                                        <td>Request received</td>
+                                    </tr>
+                                    <tr>
+                                        <td>2020-02-02 10:56:23</td>
+                                        <td>Request received</td>
+                                    </tr>
+                                </tbody>
+                            </table>
                         </div>
                     </div>
                 </div>
diff --git a/target/classes/static/css/main.css b/target/classes/static/css/main.css
index 185123b..f29cc12 100644
--- a/target/classes/static/css/main.css
+++ b/target/classes/static/css/main.css
@@ -276,4 +276,30 @@ input:focus {
     color: #f1f1f1 !important;
     background: #999999 !important;
     cursor: default !important;
-}
\ No newline at end of file
+}
+
+#historyFunction {
+    margin-top: 30px;
+    margin-bottom: 30px;
+    width: 670px;
+    display: flex;
+    align-content: space-between;
+}
+
+#historyFunction div {
+    width: 250px;
+    margin-left: 10px;
+    margin-right: 10px;
+}
+
+#historyFunction div input {
+    width: 75%;
+}
+
+#historyFunction button {
+    width: 100px;
+    margin-left: 15px;
+    margin-right: 15px;
+}
+
+
diff --git a/target/classes/static/html/mock.html b/target/classes/static/html/mock.html
index a8739a9..4614de4 100644
--- a/target/classes/static/html/mock.html
+++ b/target/classes/static/html/mock.html
@@ -91,46 +91,45 @@
                         </table>
                     </div>
                     <div id="history" style="display:none;">
+                        <div id="historyFunction">
+                            <div>
+                                <label for="historyFrom">From</label>
+                                <input type="datetime-local" name="dateFrom" id="historyFrom"/>
+                            </div>
+                            <div>
+                                <label for="historyTo">To</label>
+                                <input type="datetime-local" name="dateTo" id="historyTo"/>
+                            </div>
+                            <button id="btn-searchHistory">Search</button>
+                        </div>
+                        <div style="clear:both;"></div>
                         <div id="historyDisplay">
-                            <div>
-                                <div>
-                                    <label for="historyFrom">From</label>
-                                    <input type="datetime-local" name="dateFrom" id="historyFrom"/>
-                                </div>
-                                <div>
-                                    <label for="historyTo">To</label>
-                                    <input type="datetime-local" name="dateTo" id="historyTo"/>
-                                </div>
-                                <button id="btn-searchHistory">Search</button>
-                            </div>
-                            <div>
-                                <table id="historyTable" class="simpleTable">
-                                    <thead>
-                                        <tr class="head">
-                                            <th>Timestamp</th>
-                                            <th>Status</th>
-                                        </tr>
-                                    </thead>
-                                    <tbody>
-                                        <tr>
-                                            <td>2020-02-02 10:56:23</td>
-                                            <td>Request received</td>
-                                        </tr>
-                                        <tr>
-                                            <td>2020-02-02 10:56:23</td>
-                                            <td>Request received</td>
-                                        </tr>
-                                        <tr>
-                                            <td>2020-02-02 10:56:23</td>
-                                            <td>Request received</td>
-                                        </tr>
-                                        <tr>
-                                            <td>2020-02-02 10:56:23</td>
-                                            <td>Request received</td>
-                                        </tr>
-                                    </tbody>
-                                </table>
-                            </div>
+                            <table id="historyTable" class="simpleTable">
+                                <thead>
+                                    <tr class="head">
+                                        <th>Timestamp</th>
+                                        <th>Status</th>
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                    <tr>
+                                        <td>2020-02-02 10:56:23</td>
+                                        <td>Request received</td>
+                                    </tr>
+                                    <tr>
+                                        <td>2020-02-02 10:56:23</td>
+                                        <td>Request received</td>
+                                    </tr>
+                                    <tr>
+                                        <td>2020-02-02 10:56:23</td>
+                                        <td>Request received</td>
+                                    </tr>
+                                    <tr>
+                                        <td>2020-02-02 10:56:23</td>
+                                        <td>Request received</td>
+                                    </tr>
+                                </tbody>
+                            </table>
                         </div>
                     </div>
                 </div>