diff --git a/app/ServiceProvider/ClassProvider.php b/app/ServiceProvider/ClassProvider.php
index 02e5004e0..acba26d49 100644
--- a/app/ServiceProvider/ClassProvider.php
+++ b/app/ServiceProvider/ClassProvider.php
@@ -27,7 +27,7 @@ class ClassProvider implements ServiceProviderInterface
             'Notification',
             'Project',
             'ProjectActivity',
-            'ProjectAnalytics',
+            'ProjectAnalytic',
             'ProjectDailySummary',
             'ProjectPaginator',
             'ProjectPermission',
diff --git a/app/Template/subtask/show.php b/app/Template/subtask/show.php
index d0b3a6068..b453762c9 100644
--- a/app/Template/subtask/show.php
+++ b/app/Template/subtask/show.php
@@ -7,8 +7,8 @@
 
     <table class="subtasks-table">
         <tr>
-            <th width="40%"><?= t('Title') ?></th>
-            <th><?= t('Status') ?></th>
+            <th class="column-40"><?= t('Title') ?></th>
+            <th class="column-15"><?= t('Status') ?></th>
             <th><?= t('Assignee') ?></th>
             <th><?= t('Time tracking') ?></th>
             <?php if (! isset($not_editable)): ?>
@@ -42,9 +42,14 @@
             </td>
             <?php if (! isset($not_editable)): ?>
                 <td>
-                    <?= $this->a(t('Edit'), 'subtask', 'edit', array('task_id' => $task['id'], 'subtask_id' => $subtask['id'])) ?>
-                    <?= t('or') ?>
-                    <?= $this->a(t('Remove'), 'subtask', 'confirm', array('task_id' => $task['id'], 'subtask_id' => $subtask['id'])) ?>
+                    <ul>
+                        <li>
+                            <?= $this->a(t('Edit'), 'subtask', 'edit', array('task_id' => $task['id'], 'subtask_id' => $subtask['id'])) ?>
+                        </li>
+                        <li>
+                            <?= $this->a(t('Remove'), 'subtask', 'confirm', array('task_id' => $task['id'], 'subtask_id' => $subtask['id'])) ?>
+                        </li>
+                    </ul>
                 </td>
             <?php endif ?>
         </tr>
diff --git a/app/Template/swimlane/table.php b/app/Template/swimlane/table.php
index 32870ecc2..cf22e31b1 100644
--- a/app/Template/swimlane/table.php
+++ b/app/Template/swimlane/table.php
@@ -3,8 +3,8 @@
         <?php if (! isset($hide_position)): ?>
             <th><?= t('Position') ?></th>
         <?php endif ?>
-        <th class="column-70"><?= t('Name') ?></th>
-        <th><?= t('Actions') ?></th>
+        <th class="column-60"><?= t('Name') ?></th>
+        <th class="column-35"><?= t('Actions') ?></th>
     </tr>
     <?php foreach ($swimlanes as $swimlane): ?>
     <tr>
diff --git a/assets/css/app.css b/assets/css/app.css
index ab3c218b6..25eeb4059 100644
--- a/assets/css/app.css
+++ b/assets/css/app.css
@@ -156,6 +156,10 @@ th a:hover {
     width: 30%;
 }
 
+.column-35 {
+    width: 35%;
+}
+
 .column-40 {
     width: 40%;
 }
@@ -1153,6 +1157,7 @@ tr td.task-orange,
     border: 1px solid #ddd;
     color: #333;
     background-color: #fefefe;
+    overflow: auto;
 }
 
 .listing li {
@@ -1345,6 +1350,15 @@ tr td.task-orange,
     td > input[type="text"] {
         max-width: 150px;
     }
+
+    .task-time-form label {
+        display: block;
+    }
+
+    .task-time-form input[type="submit"] {
+        margin-top: 10px;
+        display: block;
+    }
 }
 
 @media only screen and (max-width: 1024px) and (orientation: landscape) {
diff --git a/assets/css/listing.css b/assets/css/listing.css
index c71b8a777..c40c4821a 100644
--- a/assets/css/listing.css
+++ b/assets/css/listing.css
@@ -6,6 +6,7 @@
     border: 1px solid #ddd;
     color: #333;
     background-color: #fefefe;
+    overflow: auto;
 }
 
 .listing li {
diff --git a/assets/css/responsive.css b/assets/css/responsive.css
index ac767bbbd..f319c3414 100644
--- a/assets/css/responsive.css
+++ b/assets/css/responsive.css
@@ -30,6 +30,15 @@
     td > input[type="text"] {
         max-width: 150px;
     }
+
+    .task-time-form label {
+        display: block;
+    }
+
+    .task-time-form input[type="submit"] {
+        margin-top: 10px;
+        display: block;
+    }
 }
 
 @media only screen and (max-width: 1024px) and (orientation: landscape) {
diff --git a/assets/css/table.css b/assets/css/table.css
index 7c7be56bf..9bc0c712e 100644
--- a/assets/css/table.css
+++ b/assets/css/table.css
@@ -82,6 +82,10 @@ th a:hover {
     width: 30%;
 }
 
+.column-35 {
+    width: 35%;
+}
+
 .column-40 {
     width: 40%;
 }