diff --git a/res/app/control-panes/dashboard/upload/activities/activities-controller.js b/res/app/control-panes/dashboard/upload/activities/activities-controller.js
index f38fbb5f..991c60fd 100644
--- a/res/app/control-panes/dashboard/upload/activities/activities-controller.js
+++ b/res/app/control-panes/dashboard/upload/activities/activities-controller.js
@@ -1,18 +1,18 @@
 var _ = require('lodash')
 
 module.exports = function ActivitiesCtrl($scope, $rootScope) {
-  $scope.activityActions = []
-  $scope.activityCategories = []
-  $scope.activityData = []
-  $scope.packageNames = []
-  $scope.activityNames = []
-
   $scope.selectedAction = ''
   $scope.selectedCategory = ''
   $scope.selectedData = ''
-  $scope.selectedPackageName = ''
+  $scope.selectedPackageName = $scope.installation.manifest.package || ''
   $scope.selectedActivityName = ''
 
+  $scope.activityActions = []
+  $scope.activityCategories = []
+  $scope.activityData = []
+  $scope.packageNames = [$scope.selectedPackageName]
+  $scope.activityNames = []
+
   $scope.$watch('installation.manifest.application', function (newValue) {
     if (newValue.activities) {
       var activityActions = []
@@ -67,9 +67,6 @@ module.exports = function ActivitiesCtrl($scope, $rootScope) {
       $scope.activityCategories = _.uniq(activityCategories)
       $scope.activityData = _.uniq(activityData)
       $scope.activityNames = _.uniq(activityNames)
-      $scope.packageNames.push(newValue.name)
-
-      $scope.selectedPackageName = newValue.name
     }
   })
 
diff --git a/res/app/control-panes/dashboard/upload/activities/activities.jade b/res/app/control-panes/dashboard/upload/activities/activities.jade
index 2468ce27..64dac323 100644
--- a/res/app/control-panes/dashboard/upload/activities/activities.jade
+++ b/res/app/control-panes/dashboard/upload/activities/activities.jade
@@ -1,27 +1,33 @@
 div(ng-controller='ActivitiesCtrl')
   form
-    fieldset
-      .form-group
-        label(for='selectedActivityName') Package Name
-        input.form-control(type='text', placeholder='', ng-model='selectedPackageName',
-          typeahead='packageName for packageName in packageNames', id='selectedPackageName')
-      .form-group
-        label(for='selectedActivityName') Activity Name
-        input.form-control(type='text', placeholder='', ng-model='selectedActivityName',
-          typeahead='activityName for activityName in activityNames', id='selectedActivityName')
-      .form-group
-        label(for='selectedActivityName') Action
-        input.form-control(type='text', placeholder='', ng-model='selectedAction',
-          typeahead='action for action in activityActions', id='selectedAction')
-      .form-group
-        label(for='selectedActivityName') Category
-        input.form-control(type='text', placeholder='', ng-model='selectedCategory',
-          typeahead='category for category in activityCategories', id='selectedCategory')
-      .form-group
-        label(for='selectedActivityName') Data
-        input.form-control(type='text', placeholder='', ng-model='selectedData',
-          typeahead='data for data in activityData', id='selectedData')
+    table.table.table-condensed
+      tbody
+        tr
+          td Package
+          td
+            input.form-control(type='text', placeholder='', ng-model='selectedPackageName',
+            typeahead='packageName for packageName in packageNames')
+        tr
+          td Activity
+          td
+            input.form-control(type='text', placeholder='', ng-model='selectedActivityName',
+            typeahead='activityName for activityName in activityNames')
+        tr
+          td Action
+          td
+            input.form-control(type='text', placeholder='', ng-model='selectedAction',
+            typeahead='action for action in activityActions')
+        tr
+          td Category
+          td
+            input.form-control(type='text', placeholder='', ng-model='selectedCategory',
+            typeahead='category for category in activityCategories')
+        tr
+          td Data
+          td
+            input.form-control(type='text', placeholder='', ng-model='selectedData',
+            typeahead='data for data in activityData', id='selectedData')
 
-      button.btn.btn-sm.btn-primary-outline(ng-click='runActivity()')
-        i.fa.fa-play
-        span(translate) Launch Activity
+    button.btn.btn-sm.btn-primary-outline(ng-click='runActivity()').pull-right
+      i.fa.fa-play
+      span(translate) Launch Activity
diff --git a/res/app/control-panes/dashboard/upload/upload.jade b/res/app/control-panes/dashboard/upload/upload.jade
index c4a9aac8..3d2a5f7e 100644
--- a/res/app/control-panes/dashboard/upload/upload.jade
+++ b/res/app/control-panes/dashboard/upload/upload.jade
@@ -50,9 +50,9 @@
 
     .upload-status(ng-if='upload || installation')
 
-      accordion(close-others='false')
+      accordion(close-others='false').pointer
         accordion-group(is-open='true')
-          accordion-heading
+          accordion-heading.pointer
             i.fa.fa-file-o
             span  {{installation.manifest.package || "App" }}