diff --git a/websiteFunctions/templates/websiteFunctions/DockerSiteHome.html b/websiteFunctions/templates/websiteFunctions/DockerSiteHome.html
index 82ea585a4..1baadc8d6 100644
--- a/websiteFunctions/templates/websiteFunctions/DockerSiteHome.html
+++ b/websiteFunctions/templates/websiteFunctions/DockerSiteHome.html
@@ -157,7 +157,7 @@
             <p>{% trans "Manage containers on server" %}</p>
         </div>
 
-        <div class="panel" ng-hide="listcontainerview">
+        <div class="panel" ng-hide="true">
             <div class="panel-body">
                 <h3 class="content-box-header">
                     {% trans "Containers" %} {{ dockerSite.SiteName }}<img id="imageLoading"
@@ -165,165 +165,134 @@
                                                                            style="display: none;">
                 </h3>
                 <span style="display: none" id="sitename">{{ dockerSite.SiteName }}</span>
-                <div class="example-box-wrapper ">
+                <div class="example-box-wrapper">
+                    <div ng-repeat="web in ContainerList track by $index" ng-init="Lunchcontainer(web.id)"></div>
+                </div>
 
-                    <table cellpadding="0" cellspacing="0" border="0" class="table table-striped" id="datatable-example"
-                           style="padding:0px;">
+                <div id="listFail" class="alert alert-danger">
+                    <p>{% trans "Error message:" %} {$ errorMessage $}</p>
+                </div>
+
+                <div class="row text-center">
+
+                    <div class="col-sm-4 col-sm-offset-8">
+
+                        <nav aria-label="Page navigation">
+                            <ul class="pagination">
+
+
+                                {% for items in pagination %}
+
+                                    <li ng-click="getFurtherContainersFromDB({{ forloop.counter }})" id="webPages">
+                                        <a href="">{{ forloop.counter }}</a></li>
+
+                                {% endfor %}
+
+                            </ul>
+                        </nav>
+
+
+                    </div>
+
+
+                </div>
+
+                {% if showUnlistedContainer %}
+                    <h3 class="title-hero">
+                        {% trans "Unlisted Containers" %} <i class="fa fa-question-circle"
+                                                             title="{% trans "Containers listed below were either not created through panel or were not saved to database properly" %}"></i>
+                    </h3>
+
+                    <table cellpadding="0" cellspacing="0" border="0" class="table table-striped table-bordered"
+                           id="datatable-example">
                         <thead>
                         <tr>
                             <th>Name</th>
-                            <th>Launch</th>
-                            {#                            <th>Owner</th>#}
-                            {#                            <th>Image</th>#}
-                            {#                            <th>Tag</th>#}
-{#                            <th>Actions</th>#}
+                            <th>Status</th>
+                            <th>Actions</th>
                         </tr>
                         </thead>
                         <tbody>
 
-                        <tr ng-repeat="web in ContainerList track by $index">
-                            <td ng-bind="web.name"></td>
-                            <td ng-init="Lunchcontainer(web.id)"></td>
-                            {#                            <td ng-bind="web.admin"></td>#}
-                            {#                            <td ng-bind="web.image"></td>#}
-                            {#                            <td ng-bind="web.tag"></td>#}
-{#                            <td>#}
-{#                                <button class="btn btn-primary" ng-click="delContainer(web.name)"><i#}
-{#                                        class="fa fa-trash btn-icon"></i></button>#}
-                                {#                                <button class="btn btn-primary" ng-click="showLog(web.name)"><i#}
-                                {#                                        class="fa fa-file btn-icon"></i></button>#}
-{#                            </td>#}
-                        </tr>
+                        {% for container in unlistedContainers %}
+                            <tr>
+                                <td>{{ container.name }}</td>
+                                <td>{{ container.status }}</td>
+                                <td>
+                                    <button class="btn btn-primary"
+                                            ng-click="delContainer('{{ container.name }}', true)"><i
+                                            class="fa fa-trash"></i></button>
+                                    <button class="btn btn-primary" ng-click="showLog('{{ container.name }}')"><i
+                                            class="fa fa-file"></i></button>
+                                    <button class="btn btn-primary"
+                                            ng-click="assignContainer('{{ container.name }}')"><i
+                                            class="fa fa-user"></i></button>
+                                </td>
+                            </tr>
+                        {% endfor %}
 
                         </tbody>
                     </table>
 
+                {% endif %}
 
-                    <div id="listFail" class="alert alert-danger">
-                        <p>{% trans "Error message:" %} {$ errorMessage $}</p>
-                    </div>
+                <div id="logs" class="modal fade" role="dialog">
+                    <div class="modal-dialog">
 
-                    <div class="row text-center">
-
-                        <div class="col-sm-4 col-sm-offset-8">
-
-                            <nav aria-label="Page navigation">
-                                <ul class="pagination">
-
-
-                                    {% for items in pagination %}
-
-                                        <li ng-click="getFurtherContainersFromDB({{ forloop.counter }})" id="webPages">
-                                            <a href="">{{ forloop.counter }}</a></li>
-
-                                    {% endfor %}
-
-                                </ul>
-                            </nav>
-
-
-                        </div>
-
-
-                    </div>
-
-                    {% if showUnlistedContainer %}
-                        <h3 class="title-hero">
-                            {% trans "Unlisted Containers" %} <i class="fa fa-question-circle"
-                                                                 title="{% trans "Containers listed below were either not created through panel or were not saved to database properly" %}"></i>
-                        </h3>
-
-                        <table cellpadding="0" cellspacing="0" border="0" class="table table-striped table-bordered"
-                               id="datatable-example">
-                            <thead>
-                            <tr>
-                                <th>Name</th>
-                                <th>Status</th>
-                                <th>Actions</th>
-                            </tr>
-                            </thead>
-                            <tbody>
-
-                            {% for container in unlistedContainers %}
-                                <tr>
-                                    <td>{{ container.name }}</td>
-                                    <td>{{ container.status }}</td>
-                                    <td>
-                                        <button class="btn btn-primary"
-                                                ng-click="delContainer('{{ container.name }}', true)"><i
-                                                class="fa fa-trash"></i></button>
-                                        <button class="btn btn-primary" ng-click="showLog('{{ container.name }}')"><i
-                                                class="fa fa-file"></i></button>
-                                        <button class="btn btn-primary"
-                                                ng-click="assignContainer('{{ container.name }}')"><i
-                                                class="fa fa-user"></i></button>
-                                    </td>
-                                </tr>
-                            {% endfor %}
-
-                            </tbody>
-                        </table>
-
-                    {% endif %}
-
-                    <div id="logs" class="modal fade" role="dialog">
-                        <div class="modal-dialog">
-
-                            <!-- Modal content-->
-                            <div class="modal-content">
-                                <div class="modal-header">
-                                    <button type="button" class="close" data-dismiss="modal">&times;</button>
-                                    <h4 class="modal-title">Container logs</h4>
-                                </div>
-                                <div class="modal-body">
-                                    <textarea name="logs" class="form-control" id="" cols="30"
-                                              rows="10">{$ logs $}</textarea>
-                                </div>
-                                <div class="modal-footer">
-                                    <button type="button" class="btn btn-primary" ng-click="showLog('', true)">Refresh
-                                    </button>
-                                    <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-                                </div>
+                        <!-- Modal content-->
+                        <div class="modal-content">
+                            <div class="modal-header">
+                                <button type="button" class="close" data-dismiss="modal">&times;</button>
+                                <h4 class="modal-title">Container logs</h4>
                             </div>
-
-                        </div>
-                    </div>
-
-                    <div id="assign" class="modal fade" role="dialog">
-                        <div class="modal-dialog">
-
-                            <!-- Modal content-->
-                            <div class="modal-content">
-                                <div class="modal-header">
-                                    <button type="button" class="close" data-dismiss="modal">&times;</button>
-                                    <h4 class="modal-title">Assign Container to user</h4>
-                                </div>
-                                <div class="modal-body">
-                                    <form action="/" class="form-horizontal">
-                                        <div ng-hide="installationDetailsForm" class="form-group">
-                                            <label class="col-sm-3 control-label">{% trans "Select Owner" %}</label>
-                                            <div class="col-sm-6">
-                                                <select ng-model="dockerOwner" class="form-control">
-                                                    {% for user in adminNames %}
-                                                        <option>{{ user }}</option>
-                                                    {% endfor %}
-                                                </select>
-                                            </div>
-                                        </div>
-                                    </form>
-                                </div>
-                                <div class="modal-footer">
-                                    <button type="button" class="btn btn-primary" ng-click="submitAssignContainer()">
-                                        Submit
-                                    </button>
-                                    <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-                                </div>
+                            <div class="modal-body">
+                                <textarea name="logs" class="form-control" id="" cols="30"
+                                          rows="10">{$ logs $}</textarea>
+                            </div>
+                            <div class="modal-footer">
+                                <button type="button" class="btn btn-primary" ng-click="showLog('', true)">Refresh
+                                </button>
+                                <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
                             </div>
-
                         </div>
-                    </div>
 
+                    </div>
                 </div>
+
+                <div id="assign" class="modal fade" role="dialog">
+                    <div class="modal-dialog">
+
+                        <!-- Modal content-->
+                        <div class="modal-content">
+                            <div class="modal-header">
+                                <button type="button" class="close" data-dismiss="modal">&times;</button>
+                                <h4 class="modal-title">Assign Container to user</h4>
+                            </div>
+                            <div class="modal-body">
+                                <form action="/" class="form-horizontal">
+                                    <div ng-hide="installationDetailsForm" class="form-group">
+                                        <label class="col-sm-3 control-label">{% trans "Select Owner" %}</label>
+                                        <div class="col-sm-6">
+                                            <select ng-model="dockerOwner" class="form-control">
+                                                {% for user in adminNames %}
+                                                    <option>{{ user }}</option>
+                                                {% endfor %}
+                                            </select>
+                                        </div>
+                                    </div>
+                                </form>
+                            </div>
+                            <div class="modal-footer">
+                                <button type="button" class="btn btn-primary" ng-click="submitAssignContainer()">
+                                    Submit
+                                </button>
+                                <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+                            </div>
+                        </div>
+
+                    </div>
+                </div>
+
             </div>
         </div>
         <div ng-hide="conatinerview">
@@ -399,7 +368,7 @@
                                         <div class="col-md-6">
                                             <div class="info-box shadow-sm">
                                                 <h4 class="border-bottom pb-2 mb-3">Network & Ports</h4>
-                                                <div ng-if="web.ports && (web.ports | objLength) > 0">
+                                                <div ng-if="web.ports">
                                                     <div class="table-responsive">
                                                         <table class="table table-striped table-hover mb-0">
                                                             <thead>
@@ -421,7 +390,7 @@
                                                         </table>
                                                     </div>
                                                 </div>
-                                                <div ng-if="!web.ports || (web.ports | objLength) === 0" class="text-muted">
+                                                <div ng-if="!web.ports" class="text-muted">
                                                     <p class="mb-0">No ports exposed</p>
                                                 </div>
                                             </div>