diff --git a/src/views/apps.html b/src/views/apps.html
index 6d6043394..852fa5e00 100644
--- a/src/views/apps.html
+++ b/src/views/apps.html
@@ -6,150 +6,155 @@
                 <h4 class="modal-title" ng-show="(appConfigure.app | installError)">Repair {{ appConfigure.app.fqdn }}</h4>
                 <h4 class="modal-title" ng-hide="(appConfigure.app | installError)">Configure {{ appConfigure.app.fqdn }}</h4>
             </div>
-            <div class="modal-body">
+            <div class="modal-body" style="padding: 0 15px">
                 <fieldset>
                     <form role="form" name="appConfigureForm" ng-submit="appConfigure.submit()" autocomplete="off">
-                        <div class="has-error text-center" ng-show="appConfigure.error.other">{{ appConfigure.error.other }}</div>
-                        <div class="form-group" ng-class="{ 'has-error': (appConfigureForm.location.$dirty && appConfigureForm.location.$invalid) || (!appConfigureForm.location.$dirty && appConfigure.error.location)  }">
-                            <label class="control-label" for="appConfigureLocationInput">Location {{ appConfigure.error.location }} </label>
-                            <div class="input-group form-inline">
-                                <input type="text" class="form-control" ng-model="appConfigure.location" id="appConfigureLocationInput" name="location" placeholder="{{ 'Leave empty to use bare domain' }}" autofocus>
-
-                                <div class="input-group-btn">
-                                    <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
-                                        {{ (!appConfigure.location ? '' : (appConfigure.domain.provider !== 'caas' ? '.' : '-')) + appConfigure.domain.domain }}
-                                        <span class="caret"></span>
-                                    </button>
-                                    <ul class="dropdown-menu dropdown-menu-right" role="menu">
-                                        <li ng-repeat="domain in domains">
-                                            <a href="" ng-click="appConfigure.domain = domain">{{ domain.domain }}</a>
-                                        </li>
-                                    </ul>
-                                </div>
-                            </div>
-                        </div>
-
-                        <p class="text-center" ng-show="appConfigure.location && dnsConfig.provider === 'manual' && !dnsConfig.wildcard">
-                            <b>Add an A record manually for {{ appConfigure.location }} to this Cloudron's public IP</b>
-                            <br>
-                        </p>
-
-                        <div class="has-error text-center" ng-show="appConfigure.error.port">{{ appConfigure.error.port }}</div>
-                        <div ng-repeat="(env, info) in appConfigure.portBindingsInfo">
-                            <ng-form name="portInfo_form">
-                                <div class="form-group" ng-class="{ 'has-error': (!appConfigureForm.itemName{{$index}}.$dirty && appConfigure.error.port) || (portInfo_form.itemName{{$index}}.$dirty && portInfo_form.itemName{{$index}}.$invalid) }">
-                                    <label class="control-label" for="appConfigurePortInput{{env}}"><input type="checkbox" ng-model="appConfigure.portBindingsEnabled[env]"> {{ info.description }} ({{ HOST_PORT_MIN }} - {{ HOST_PORT_MAX }})</label>
-                                    <input type="number" class="form-control" ng-model="appConfigure.portBindings[env]" ng-disabled="!appConfigure.portBindingsEnabled[env]" id="appConfigurePortInput{{env}}" later-name="itemName{{$index}}" min="{{HOST_PORT_MIN}}" max="{{HOST_PORT_MAX}}" required>
-                                </div>
-                            </ng-form>
-                        </div>
-
-                        <div class="form-group" ng-show="appConfigure.customAuth && !appConfigure.app.manifest.addons.email">
-                            <label class="control-label">User management</label>
-                            <p>
-                                This app has it's own user management.
-                            </p>
-                        </div>
-
-                        <div class="form-group" ng-show="!appConfigure.customAuth && appConfigure.app.sso === false">
-                            <label class="control-label">User management</label>
-                            <p>
-                                This app is configured to use it's own user management.
-                            </p>
-                        </div>
-
-                        <div class="form-group" ng-show="appConfigure.app.manifest.addons.email">
-                            <label class="control-label">User management</label>
-                            <p>
-                                All users with a mailbox on this Cloudron have access.
-                            </p>
-                        </div>
-
-                        <div class="form-group" ng-hide="appConfigure.customAuth || appConfigure.app.manifest.addons.email || appConfigure.app.sso === false">
-                            <label class="control-label">User management</label>
-                            <div class="radio">
-                                <label>
-                                    <input type="radio" ng-model="appConfigure.accessRestrictionOption" value="any">
-                                    Allow all users from this Cloudron
-                                </label>
-                            </div>
-                            <div class="radio">
-                                <label>
-                                    <input type="radio" ng-model="appConfigure.accessRestrictionOption" value="groups">
-                                    Only allow the following users and groups <span class="label label-danger" ng-show="appConfigure.accessRestrictionOption === 'groups' && !appConfigure.isAccessRestrictionValid()">Select at least one user or group</span>
-                                </label>
-                            </div>
-                            <div>
-                                <div style="margin-left: 20px;">
-                                    <div class="col-md-5">
-                                        Users:
-                                        <multiselect class="input-sm stretch" ng-model="appConfigure.accessRestriction.users" ng-disabled="appConfigure.accessRestrictionOption !== 'groups'" options="user.display for user in users" data-multiple="true"></multiselect>
-                                    </div>
-
-                                    <div class="col-md-5">
-                                        Groups:
-                                        <multiselect class="input-sm stretch" ng-model="appConfigure.accessRestriction.groups" ng-disabled="appConfigure.accessRestrictionOption !== 'groups'" options="group.name for group in (groups | ignoreAdminGroup)" data-multiple="true"></multiselect>
-                                    </div>
-                                </div>
-                            </div>
-
-                            <br/>
-                            <br/>
-                        </div>
-
-                        <p ng-show="appConfigure.app.manifest.addons.email" class="text-info">
-                            This app is pre-configured for use with <a href="https://cloudron.io/documentation/email/" target="_blank">Cloudron Email</a>.
-                        </p>
-
-                        <a href="" ng-click="appConfigure.advancedVisible = true" ng-hide="appConfigure.advancedVisible">Advanced settings...</a>
-                        <div  uib-collapse="!appConfigure.advancedVisible">
-                            <div class="form-group">
-                                <label class="control-label" for="memoryLimit">Memory Limit <sup><a ng-href="{{ config.webServerOrigin }}/documentation/apps/#increasing-the-memory-limit-of-an-app" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup> : <b>{{ appConfigure.memoryLimit ? appConfigure.memoryLimit / 1024 / 1024 + 'MB' : 'Default (256 MB)' }}</b></label>
+                        <uib-tabset>
+                            <uib-tab index="0" heading="General">
                                 <br/>
-                                <div style="padding: 0 10px;">
-                                    <slider id="memoryLimit" ng-model="appConfigure.memoryLimit" step="134217728" tooltip="hide" ticks="appConfigure.memoryTicks" ticks-snap-bounds="67108864"></slider>
-                                </div>
-                            </div>
+                                <div class="has-error text-center" ng-show="appConfigure.error.other">{{ appConfigure.error.other }}</div>
+                                <div class="form-group" ng-class="{ 'has-error': (appConfigureForm.location.$dirty && appConfigureForm.location.$invalid) || (!appConfigureForm.location.$dirty && appConfigure.error.location)  }">
+                                    <label class="control-label" for="appConfigureLocationInput">Location {{ appConfigure.error.location }} </label>
+                                    <div class="input-group form-inline">
+                                        <input type="text" class="form-control" ng-model="appConfigure.location" id="appConfigureLocationInput" name="location" placeholder="{{ 'Leave empty to use bare domain' }}" autofocus>
 
-                            <div class="form-group" ng-class="{ 'has-error': !appConfigureForm.xFrameOptions.$dirty && appConfigure.error.xFrameOptions }">
-                                <label class="control-label">Allow embedding from the following site</label>
-                                <div class="control-label" ng-show="appConfigure.error.xFrameOptions"><small>Must be empty of a valid URL</small></div>
-                                <input type="text" class="form-control" id="appConfigureXFrameOptionsInput" name="xFrameOptions" placeholder="https://example.com" ng-model="appConfigure.xFrameOptions" uib-tooltip="Leave blank to not allow embedding">
-                            </div>
-
-                            <div class="form-group">
-                                <label class="control-label">Specify robots.txt file content</label>
-                                <textarea ng-model="appConfigure.robotsTxt" placeholder="Leave empty to allow all bots to index this app." class="form-control" rows="3"></textarea>
-                            </div>
-
-                            <div class="form-group">
-                                <input type="checkbox" id="appConfigureEnableBackup" ng-model="appConfigure.enableBackup">
-                                <label class="control-label" for="appConfigureEnableBackup">Enable automatic daily backups</label>
-                            </div>
-
-                            <div class="hide">
-                                <label class="control-label" for="appConfigureCertificateInput" ng-show="appConfigure.domain.provider !== 'caas'">Certificate (optional)</label>
-                                <div class="has-error text-center" ng-show="appConfigure.error.cert && appConfigure.domain.provider !== 'caas'">{{ appConfigure.error.cert }}</div>
-                                <div class="form-group" ng-class="{ 'has-error': !appConfigureForm.certificate.$dirty && appConfigure.error.cert }" ng-show="appConfigure.domain.provider !== 'caas'">
-                                    <div class="input-group">
-                                        <input type="file" id="appConfigureCertificateFileInput" style="display:none"/>
-                                        <input type="text" class="form-control" placeholder="Certificate" ng-model="appConfigure.certificateFileName" id="appConfigureCertificateInput" name="certificate" onclick="getElementById('appConfigureCertificateFileInput').click();" style="cursor: pointer;" ng-required="appConfigure.keyFileName">
-                                        <span class="input-group-addon">
-                                            <i class="fa fa-upload" onclick="getElementById('appConfigureCertificateFileInput').click();"></i>
-                                        </span>
+                                        <div class="input-group-btn">
+                                            <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+                                                {{ (!appConfigure.location ? '' : (appConfigure.domain.provider !== 'caas' ? '.' : '-')) + appConfigure.domain.domain }}
+                                                <span class="caret"></span>
+                                            </button>
+                                            <ul class="dropdown-menu dropdown-menu-right" role="menu">
+                                                <li ng-repeat="domain in domains">
+                                                    <a href="" ng-click="appConfigure.domain = domain">{{ domain.domain }}</a>
+                                                </li>
+                                            </ul>
+                                        </div>
                                     </div>
                                 </div>
-                                <div class="form-group" ng-class="{ 'has-error': !appConfigureForm.key.$dirty && appConfigure.error.cert }" ng-show="appConfigure.domain.provider !== 'caas'">
-                                    <div class="input-group">
-                                        <input type="file" id="appConfigureKeyFileInput" style="display:none"/>
-                                        <input type="text" class="form-control" placeholder="Key" ng-model="appConfigure.keyFileName" id="appConfigureKeyInput" name="key" onclick="getElementById('appConfigureKeyFileInput').click();" style="cursor: pointer;" ng-required="appConfigure.certificateFileName">
-                                        <span class="input-group-addon">
-                                            <i class="fa fa-upload" onclick="getElementById('appConfigureKeyFileInput').click();"></i>
-                                        </span>
+
+                                <p class="text-center" ng-show="appConfigure.location && dnsConfig.provider === 'manual' && !dnsConfig.wildcard">
+                                    <b>Add an A record manually for {{ appConfigure.location }} to this Cloudron's public IP</b>
+                                    <br>
+                                </p>
+
+                                <div class="has-error text-center" ng-show="appConfigure.error.port">{{ appConfigure.error.port }}</div>
+                                <div ng-repeat="(env, info) in appConfigure.portBindingsInfo">
+                                    <ng-form name="portInfo_form">
+                                        <div class="form-group" ng-class="{ 'has-error': (!appConfigureForm.itemName{{$index}}.$dirty && appConfigure.error.port) || (portInfo_form.itemName{{$index}}.$dirty && portInfo_form.itemName{{$index}}.$invalid) }">
+                                            <label class="control-label" for="appConfigurePortInput{{env}}"><input type="checkbox" ng-model="appConfigure.portBindingsEnabled[env]"> {{ info.description }} ({{ HOST_PORT_MIN }} - {{ HOST_PORT_MAX }})</label>
+                                            <input type="number" class="form-control" ng-model="appConfigure.portBindings[env]" ng-disabled="!appConfigure.portBindingsEnabled[env]" id="appConfigurePortInput{{env}}" later-name="itemName{{$index}}" min="{{HOST_PORT_MIN}}" max="{{HOST_PORT_MAX}}" required>
+                                        </div>
+                                    </ng-form>
+                                </div>
+
+                                <div class="form-group" ng-show="appConfigure.customAuth && !appConfigure.app.manifest.addons.email">
+                                    <label class="control-label">User management</label>
+                                    <p>
+                                        This app has it's own user management.
+                                    </p>
+                                </div>
+
+                                <div class="form-group" ng-show="!appConfigure.customAuth && appConfigure.app.sso === false">
+                                    <label class="control-label">User management</label>
+                                    <p>
+                                        This app is configured to use it's own user management.
+                                    </p>
+                                </div>
+
+                                <div class="form-group" ng-show="appConfigure.app.manifest.addons.email">
+                                    <label class="control-label">User management</label>
+                                    <p>
+                                        All users with a mailbox on this Cloudron have access.
+                                    </p>
+                                </div>
+
+                                <div class="form-group" ng-hide="appConfigure.customAuth || appConfigure.app.manifest.addons.email || appConfigure.app.sso === false">
+                                    <label class="control-label">User management</label>
+                                    <div class="radio">
+                                        <label>
+                                            <input type="radio" ng-model="appConfigure.accessRestrictionOption" value="any">
+                                            Allow all users from this Cloudron
+                                        </label>
+                                    </div>
+                                    <div class="radio">
+                                        <label>
+                                            <input type="radio" ng-model="appConfigure.accessRestrictionOption" value="groups">
+                                            Only allow the following users and groups <span class="label label-danger" ng-show="appConfigure.accessRestrictionOption === 'groups' && !appConfigure.isAccessRestrictionValid()">Select at least one user or group</span>
+                                        </label>
+                                    </div>
+                                    <div>
+                                        <div style="margin-left: 20px;">
+                                            <div class="col-md-5">
+                                                Users:
+                                                <multiselect class="input-sm stretch" ng-model="appConfigure.accessRestriction.users" ng-disabled="appConfigure.accessRestrictionOption !== 'groups'" options="user.display for user in users" data-multiple="true"></multiselect>
+                                            </div>
+
+                                            <div class="col-md-5">
+                                                Groups:
+                                                <multiselect class="input-sm stretch" ng-model="appConfigure.accessRestriction.groups" ng-disabled="appConfigure.accessRestrictionOption !== 'groups'" options="group.name for group in (groups | ignoreAdminGroup)" data-multiple="true"></multiselect>
+                                            </div>
+                                        </div>
+                                    </div>
+
+                                    <br/>
+                                    <br/>
+                                </div>
+
+                                <p ng-show="appConfigure.app.manifest.addons.email" class="text-info">
+                                    This app is pre-configured for use with <a href="https://cloudron.io/documentation/email/" target="_blank">Cloudron Email</a>.
+                                </p>
+                            </uib-tab>
+
+                            <uib-tab index="1" heading="Advanced">
+                                <br/>
+                                <div class="form-group">
+                                    <label class="control-label" for="memoryLimit">Memory Limit <sup><a ng-href="{{ config.webServerOrigin }}/documentation/apps/#increasing-the-memory-limit-of-an-app" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup> : <b>{{ appConfigure.memoryLimit ? appConfigure.memoryLimit / 1024 / 1024 + 'MB' : 'Default (256 MB)' }}</b></label>
+                                    <br/>
+                                    <div style="padding: 0 10px;">
+                                        <slider id="memoryLimit" ng-model="appConfigure.memoryLimit" step="134217728" tooltip="hide" ticks="appConfigure.memoryTicks" ticks-snap-bounds="67108864"></slider>
                                     </div>
                                 </div>
-                            </div>
-                        </div>
+
+                                <div class="form-group" ng-class="{ 'has-error': !appConfigureForm.xFrameOptions.$dirty && appConfigure.error.xFrameOptions }">
+                                    <label class="control-label">Allow embedding from the following site</label>
+                                    <div class="control-label" ng-show="appConfigure.error.xFrameOptions"><small>Must be empty of a valid URL</small></div>
+                                    <input type="text" class="form-control" id="appConfigureXFrameOptionsInput" name="xFrameOptions" placeholder="https://example.com" ng-model="appConfigure.xFrameOptions" uib-tooltip="Leave blank to not allow embedding">
+                                </div>
+
+                                <div class="form-group">
+                                    <label class="control-label">Specify robots.txt file content</label>
+                                    <textarea ng-model="appConfigure.robotsTxt" placeholder="Leave empty to allow all bots to index this app." class="form-control" rows="3"></textarea>
+                                </div>
+
+                                <div class="form-group">
+                                    <input type="checkbox" id="appConfigureEnableBackup" ng-model="appConfigure.enableBackup">
+                                    <label class="control-label" for="appConfigureEnableBackup">Enable automatic daily backups</label>
+                                </div>
+
+                                <div class="hide">
+                                    <label class="control-label" for="appConfigureCertificateInput" ng-show="appConfigure.domain.provider !== 'caas'">Certificate (optional)</label>
+                                    <div class="has-error text-center" ng-show="appConfigure.error.cert && appConfigure.domain.provider !== 'caas'">{{ appConfigure.error.cert }}</div>
+                                    <div class="form-group" ng-class="{ 'has-error': !appConfigureForm.certificate.$dirty && appConfigure.error.cert }" ng-show="appConfigure.domain.provider !== 'caas'">
+                                        <div class="input-group">
+                                            <input type="file" id="appConfigureCertificateFileInput" onchange="readCertificate()" style="display:none"/>
+                                            <input type="text" class="form-control" placeholder="Certificate" ng-model="appConfigure.certificateFileName" id="appConfigureCertificateInput" name="certificate" onclick="getElementById('appConfigureCertificateFileInput').click();" style="cursor: pointer;" ng-required="appConfigure.keyFileName">
+                                            <span class="input-group-addon">
+                                                <i class="fa fa-upload" onclick="getElementById('appConfigureCertificateFileInput').click();"></i>
+                                            </span>
+                                        </div>
+                                    </div>
+                                    <div class="form-group" ng-class="{ 'has-error': !appConfigureForm.key.$dirty && appConfigure.error.cert }" ng-show="appConfigure.domain.provider !== 'caas'">
+                                        <div class="input-group">
+                                            <input type="file" id="appConfigureKeyFileInput" onchange="readKey()" style="display:none"/>
+                                            <input type="text" class="form-control" placeholder="Key" ng-model="appConfigure.keyFileName" id="appConfigureKeyInput" name="key" onclick="getElementById('appConfigureKeyFileInput').click();" style="cursor: pointer;" ng-required="appConfigure.certificateFileName">
+                                            <span class="input-group-addon">
+                                                <i class="fa fa-upload" onclick="getElementById('appConfigureKeyFileInput').click();"></i>
+                                            </span>
+                                        </div>
+                                    </div>
+                                </div>
+                            </uib-tab>
+                        </uib-tabset>
 
                         <input class="ng-hide" type="submit" ng-disabled="appConfigureForm.$invalid || appConfigure.busy || (appConfigure.accessRestrictionOption === 'groups' && !appConfigure.isAccessRestrictionValid())"/>
                     </form>
diff --git a/src/views/apps.js b/src/views/apps.js
index cd966e68f..c46186406 100644
--- a/src/views/apps.js
+++ b/src/views/apps.js
@@ -314,7 +314,7 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
         $scope.appRestoreForm.$setUntouched();
     };
 
-    document.getElementById('appConfigureCertificateFileInput').onchange = function (event) {
+    $scope.readCertificate = function (event) {
         $scope.$apply(function () {
             $scope.appConfigure.certificateFile = null;
             $scope.appConfigure.certificateFileName = event.target.files[0].name;
@@ -328,7 +328,7 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
         });
     };
 
-    document.getElementById('appConfigureKeyFileInput').onchange = function (event) {
+    $scope.readKey = function (event) {
         $scope.$apply(function () {
             $scope.appConfigure.keyFile = null;
             $scope.appConfigure.keyFileName = event.target.files[0].name;