diff --git a/src/views/appstore.html b/src/views/appstore.html
index 0864d7746..88ed5a40d 100644
--- a/src/views/appstore.html
+++ b/src/views/appstore.html
@@ -1,170 +1,165 @@
 
 <!-- Modal install app -->
-<div class="modal fade appstore-install" id="appInstallModal" tabindex="-1" role="dialog" aria-labelledby="updateModalLabel" aria-hidden="true">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header">
-                <img ng-src="{{appInstall.app.iconUrl}}" onerror="this.onerror=null;this.src='img/appicon_fallback.png'" class="app-icon"/>
-                <h3 class="appstore-install-title" title="Version {{ appInstall.app.manifest.version }}">{{ appInstall.app.manifest.title }} <span class="badge badge-danger" ng-show="appInstall.app.publishState === 'testing'">Testing</span></h3>
-                <br/>
-                <span class="appstore-install-meta"><a href="{{ appInstall.app.manifest.website }}" target="_blank">{{ appInstall.app.manifest.author }}</a></span>
-                <br/>
-                <span class="appstore-install-meta">Last updated {{ appInstall.app.creationDate | prettyDate }}</span>
-                <br/>
-                <span class="appstore-install-meta hand">Requires atleast {{ appInstall.app.manifest.memoryLimit | prettyMemory }}MB memory</span>
+<div class="modal fade appstore-install" id="appInstallModal" tabindex="-1" role="dialog">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <img ng-src="{{appInstall.app.iconUrl}}" onerror="this.onerror=null;this.src='img/appicon_fallback.png'" class="app-icon"/>
+        <h3 class="appstore-install-title" title="Version {{ appInstall.app.manifest.version }}">{{ appInstall.app.manifest.title }} <span class="badge badge-danger" ng-show="appInstall.app.publishState === 'testing'">Testing</span></h3>
+        <br/>
+        <span class="appstore-install-meta"><a href="{{ appInstall.app.manifest.website }}" target="_blank">{{ appInstall.app.manifest.author }}</a></span>
+        <br/>
+        <span class="appstore-install-meta">Last updated {{ appInstall.app.creationDate | prettyDate }}</span>
+        <br/>
+        <span class="appstore-install-meta hand">Requires atleast {{ appInstall.app.manifest.memoryLimit | prettyMemory }}MB memory</span>
+      </div>
+      <div class="modal-body">
+        <div class="collapse" id="collapseInstallForm" data-toggle="false">
+          <form role="form" name="appInstallForm" ng-submit="appInstall.submit()" autocomplete="off">
+            <div class="has-error text-center" ng-show="appInstall.error.other" ng-bind-html="appInstall.error.other"></div>
+            <div class="form-group" ng-class="{ 'has-error': (appInstallForm.location.$dirty && appInstallForm.location.$invalid) || (!appInstallForm.location.$dirty && appInstall.error.location) }">
+              <label class="control-label" for="appInstallLocationInput">Location {{ appInstall.error.location }} </label>
+              <div class="input-group form-inline">
+                <input type="text" class="form-control" ng-model="appInstall.location" id="appInstallLocationInput" 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">
+                    <span>{{ (appInstall.location ? (appInstall.domain.config.hyphenatedSubdomains ? '-' : '.') : '') + appInstall.domain.domain }}</span>
+                    <span class="caret"></span>
+                  </button>
+                  <ul class="dropdown-menu dropdown-menu-right" role="menu">
+                    <li ng-repeat="domain in domains">
+                      <a href="" ng-click="appInstall.domain = domain">{{ domain.domain }}</a>
+                    </li>
+                  </ul>
+                </div>
+              </div>
             </div>
-            <div class="modal-body">
-                <div class="collapse" id="collapseInstallForm" data-toggle="false">
-                    <form role="form" name="appInstallForm" ng-submit="appInstall.submit()" autocomplete="off">
-                        <div class="has-error text-center" ng-show="appInstall.error.other" ng-bind-html="appInstall.error.other"></div>
-                        <div class="form-group" ng-class="{ 'has-error': (appInstallForm.location.$dirty && appInstallForm.location.$invalid) || (!appInstallForm.location.$dirty && appInstall.error.location) }">
-                            <label class="control-label" for="appInstallLocationInput">Location {{ appInstall.error.location }} </label>
-                            <div class="input-group form-inline">
-                                <input type="text" class="form-control" ng-model="appInstall.location" id="appInstallLocationInput" 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">
-                                        <span>{{ (appInstall.location ? (appInstall.domain.config.hyphenatedSubdomains ? '-' : '.') : '') + appInstall.domain.domain }}</span>
-                                        <span class="caret"></span>
-                                    </button>
-                                    <ul class="dropdown-menu dropdown-menu-right" role="menu">
-                                        <li ng-repeat="domain in domains">
-                                            <a href="" ng-click="appInstall.domain = domain">{{ domain.domain }}</a>
-                                        </li>
-                                    </ul>
-                                </div>
-                            </div>
-                        </div>
 
-                        <p class="text-center" ng-show="appInstall.location && appInstall.domain.provider === 'manual'">
-                            <b>Add an A record manually for {{ appInstall.location }} to this Cloudron's public IP</b>
-                            <br>
-                        </p>
+            <p class="text-center" ng-show="appInstall.location && appInstall.domain.provider === 'manual'">
+              <b>Add an A record manually for {{ appInstall.location }} to this Cloudron's public IP</b>
+              <br>
+            </p>
 
-                        <div class="has-error text-center" ng-show="appInstall.error.port">{{ appInstall.error.port }}</div>
-                        <div ng-repeat="(env, info) in appInstall.portBindingsInfo">
-                            <ng-form name="portInfo_form">
-                                <div class="form-group" ng-class="{ 'has-error': (!appInstallForm.itemName{{$index}}.$dirty && appInstall.error.port) || (portInfo_form.itemName{{$index}}.$dirty && portInfo_form.itemName{{$index}}.$invalid) }">
-                                    <label class="control-label" for="inputPortInfo{{env}}"><input type="checkbox" ng-model="appInstall.portBindingsEnabled[env]">
-                                      {{ info.title }}
-                                      <sup>
-                                        <a popover-placement="top-right" popover-trigger="outsideClick" uib-popover="{{info.description}} ({{ HOST_PORT_MIN }} - {{ HOST_PORT_MAX }})"><i class="fa fa-question-circle"></i></a>
-                                      </sup>
-                                    </label>
-                                    <input type="number" class="form-control" ng-model="appInstall.portBindings[env]" ng-disabled="!appInstall.portBindingsEnabled[env]" id="inputPortInfo{{env}}" later-name="itemName{{$index}}" min="{{hostPortMin}}" max="{{hostPortMax}}" required>
-                                </div>
-                            </ng-form>
-                        </div>
-
-                        <!-- for spaces users, the User management is hidden. thus the admin flag check -->
-                        <div class="form-group" ng-show="user.admin && appInstall.customAuth && !appInstall.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="user.admin && appInstall.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-show="user.admin && !appInstall.customAuth && !appInstall.app.manifest.addons.email">
-                            <label class="control-label">User management</label>
-                            <div class="radio" ng-show="appInstall.optionalSso">
-                                <label>
-                                    <input type="radio" ng-model="appInstall.accessRestrictionOption" value="nosso">
-                                    Leave user management to the app
-                                </label>
-                            </div>
-                            <div class="radio">
-                                <label>
-                                    <input type="radio" ng-model="appInstall.accessRestrictionOption" value="any">
-                                    Allow all users from this Cloudron
-                                </label>
-                            </div>
-                            <div class="radio">
-                                <label>
-                                    <input type="radio" ng-model="appInstall.accessRestrictionOption" value="groups">
-                                    Only allow the following users and groups <span class="label label-danger" ng-show="appInstall.accessRestrictionOption === 'groups' && !appInstall.isAccessRestrictionValid()">Select at least one user or group</span>
-                                </label>
-                            </div>
-                            <div>
-                                <div style="margin-left: 20px;">
-                                    <div class="col-md-5">
-                                        Users: &nbsp;
-                                        <multiselect ng-model="appInstall.accessRestriction.users" ng-disabled="appInstall.accessRestrictionOption !== 'groups'" options="user.username for user in users" data-multiple="true"></multiselect>
-                                    </div>
-
-                                    <div class="col-md-5">
-                                        Groups: &nbsp;
-                                        <multiselect ng-model="appInstall.accessRestriction.groups" ng-disabled="appInstall.accessRestrictionOption !== 'groups'" options="group.name for group in groups" data-multiple="true"></multiselect>
-                                    </div>
-                                </div>
-                            </div>
-
-                            <br/>
-                            <br/>
-                        </div>
-
-                        <p ng-show="appInstall.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>
-
-                        <div class="hide">
-                        <label class="control-label" for="appInstallCertificateInput" ng-show="appInstall.domain.provider !== 'caas'">Certificate (optional)</label>
-                        <div class="has-error text-center" ng-show="appInstall.error.cert && appInstall.domain.provider !== 'caas'">{{ appInstall.error.cert }}</div>
-                        <div class="form-group" ng-class="{ 'has-error': !appInstallForm.certificate.$dirty && appInstall.error.cert }" ng-show="appInstall.domain.provider !== 'caas'">
-                            <div class="input-group">
-                                <input type="file" id="appInstallCertificateFileInput" style="display:none"/>
-                                <input type="text" class="form-control" placeholder="Certificate" ng-model="appInstall.certificateFileName" id="appInstallCertificateInput" name="certificate" onclick="getElementById('appInstallCertificateFileInput').click();" style="cursor: pointer;" ng-required="appInstall.keyFileName">
-                                <span class="input-group-addon">
-                                    <i class="fa fa-upload" onclick="getElementById('appInstallCertificateFileInput').click();"></i>
-                                </span>
-                            </div>
-                        </div>
-                        <div class="form-group" ng-class="{ 'has-error': !appInstallForm.key.$dirty && appInstall.error.cert }" ng-show="appInstall.domain.provider !== 'caas'">
-                            <div class="input-group">
-                                <input type="file" id="appInstallKeyFileInput" style="display:none"/>
-                                <input type="text" class="form-control" placeholder="Key" ng-model="appInstall.keyFileName" id="appInstallKeyInput" name="key" onclick="getElementById('appInstallKeyFileInput').click();" style="cursor: pointer;" ng-required="appInstall.certificateFileName">
-                                <span class="input-group-addon">
-                                    <i class="fa fa-upload" onclick="getElementById('appInstallKeyFileInput').click();"></i>
-                                </span>
-                            </div>
-                        </div>
-                        </div>
-
-                        <input class="ng-hide" type="submit" ng-disabled="appInstallForm.$invalid || busy"/>
-                    </form>
+            <div class="has-error text-center" ng-show="appInstall.error.port">{{ appInstall.error.port }}</div>
+            <div ng-repeat="(env, info) in appInstall.portBindingsInfo">
+              <ng-form name="portInfo_form">
+                <div class="form-group" ng-class="{ 'has-error': (!appInstallForm.itemName{{$index}}.$dirty && appInstall.error.port) || (portInfo_form.itemName{{$index}}.$dirty && portInfo_form.itemName{{$index}}.$invalid) }">
+                  <label class="control-label" for="inputPortInfo{{env}}"><input type="checkbox" ng-model="appInstall.portBindingsEnabled[env]">
+                    {{ info.title }}
+                    <sup>
+                      <a popover-placement="top-right" popover-trigger="outsideClick" uib-popover="{{info.description}} ({{ HOST_PORT_MIN }} - {{ HOST_PORT_MAX }})"><i class="fa fa-question-circle"></i></a>
+                    </sup>
+                  </label>
+                  <input type="number" class="form-control" ng-model="appInstall.portBindings[env]" ng-disabled="!appInstall.portBindingsEnabled[env]" id="inputPortInfo{{env}}" later-name="itemName{{$index}}" min="{{hostPortMin}}" max="{{hostPortMax}}" required>
                 </div>
-                <div class="collapse" id="collapseMediaLinksCarousel" data-toggle="false">
-                    <div ng-repeat="mediaLink in appInstall.mediaLinks" class="slick-item" style="background-image: url('{{mediaLink}}');" ng-show="appInstall.mediaLinks.length == 1"></div>
-                    <slick init-onload="true" current-index="0" autoplay="true" arrows="false" autoplay-speed="2000" data="appInstall.mediaLinks" ng-show="appInstall.mediaLinks.length > 1">
-                        <div ng-repeat="mediaLink in appInstall.mediaLinks" class="slick-item" style="background-image: url('{{mediaLink}}');"></div>
-                    </slick>
-                    <div class="appstore-install-description">
-                        <div ng-bind-html="appInstall.app.manifest.description | markdown2html"></div>
-                    </div>
-                </div>
-                <div class="collapse" id="collapseResourceConstraint" data-toggle="false">
-                    <h4 class="text-danger">This Cloudron is running low on resources.</h4>
-                    <p>Please upgrade to a server instance with more memory. Alternately, free up resources by uninstalling unused applications.</p>
-                </div>
-                <div class="collapse" id="collapseAppLimitReached" data-toggle="false">
-                    <h4 class="text-danger">Subscription required</h4>
-                    <p>{{ appInstall.subscriptionErrorMesssage }}</p>
+              </ng-form>
+            </div>
+
+            <!-- for spaces users, the User management is hidden. thus the admin flag check -->
+            <div class="form-group" ng-show="user.admin && appInstall.customAuth && !appInstall.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="user.admin && appInstall.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-show="user.admin && !appInstall.customAuth && !appInstall.app.manifest.addons.email">
+              <label class="control-label">User management</label>
+              <div class="radio" ng-show="appInstall.optionalSso">
+                <label>
+                  <input type="radio" ng-model="appInstall.accessRestrictionOption" value="nosso">
+                  Leave user management to the app
+                </label>
+              </div>
+              <div class="radio">
+                <label>
+                  <input type="radio" ng-model="appInstall.accessRestrictionOption" value="any">
+                  Allow all users from this Cloudron
+                </label>
+              </div>
+              <div class="radio">
+                <label>
+                  <input type="radio" ng-model="appInstall.accessRestrictionOption" value="groups">
+                  Only allow the following users and groups <span class="label label-danger" ng-show="appInstall.accessRestrictionOption === 'groups' && !appInstall.isAccessRestrictionValid()">Select at least one user or group</span>
+                </label>
+              </div>
+              <div>
+                <div style="margin-left: 20px;">
+                  <div class="col-md-5">
+                    Users: &nbsp;
+                    <multiselect ng-model="appInstall.accessRestriction.users" ng-disabled="appInstall.accessRestrictionOption !== 'groups'" options="user.username for user in users" data-multiple="true"></multiselect>
+                  </div>
+
+                  <div class="col-md-5">
+                    Groups: &nbsp;
+                    <multiselect ng-model="appInstall.accessRestriction.groups" ng-disabled="appInstall.accessRestrictionOption !== 'groups'" options="group.name for group in groups" data-multiple="true"></multiselect>
                   </div>
                 </div>
-                <div class="modal-footer">
-                  <button type="button" class="btn btn-default"data-dismiss="modal">Close</button>
-                  <button type="button" class="btn btn-danger" ng-show="user.admin && appInstall.state === 'resourceConstraint'" ng-click="appInstall.showForm(true)">Install anyway</button>
-                  <button type="button" class="btn btn-success" ng-show="appInstall.state === 'appInfo'" ng-click="appInstall.showForm()">Install</button>
-                  <button type="button" class="btn btn-success" ng-show="appInstall.state === 'installForm'" ng-click="appInstall.submit()" ng-disabled="appInstallForm.$invalid || appInstall.busy"><i class="fa fa-circle-notch fa-spin" ng-show="appInstall.busy"></i> Install</button>
-                  <a class="btn btn-success" ng-show="appInstall.state === 'appLimitReached'" ng-href="{{ config.webServerOrigin + '/console.html#/userprofile?view=subscriptions&email=' + subscription.emailEncoded + '&cloudronId=' + subscription.cloudronId }}" target="_blank">Setup Subscription</a>
+              </div>
+
+              <br/>
+              <br/>
             </div>
+
+            <p ng-show="appInstall.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>
+
+            <div class="hide">
+              <label class="control-label" for="appInstallCertificateInput" ng-show="appInstall.domain.provider !== 'caas'">Certificate (optional)</label>
+              <div class="has-error text-center" ng-show="appInstall.error.cert && appInstall.domain.provider !== 'caas'">{{ appInstall.error.cert }}</div>
+              <div class="form-group" ng-class="{ 'has-error': !appInstallForm.certificate.$dirty && appInstall.error.cert }" ng-show="appInstall.domain.provider !== 'caas'">
+                <div class="input-group">
+                  <input type="file" id="appInstallCertificateFileInput" style="display:none"/>
+                  <input type="text" class="form-control" placeholder="Certificate" ng-model="appInstall.certificateFileName" id="appInstallCertificateInput" name="certificate" onclick="getElementById('appInstallCertificateFileInput').click();" style="cursor: pointer;" ng-required="appInstall.keyFileName">
+                  <span class="input-group-addon">
+                    <i class="fa fa-upload" onclick="getElementById('appInstallCertificateFileInput').click();"></i>
+                  </span>
+                </div>
+              </div>
+              <div class="form-group" ng-class="{ 'has-error': !appInstallForm.key.$dirty && appInstall.error.cert }" ng-show="appInstall.domain.provider !== 'caas'">
+                <div class="input-group">
+                  <input type="file" id="appInstallKeyFileInput" style="display:none"/>
+                  <input type="text" class="form-control" placeholder="Key" ng-model="appInstall.keyFileName" id="appInstallKeyInput" name="key" onclick="getElementById('appInstallKeyFileInput').click();" style="cursor: pointer;" ng-required="appInstall.certificateFileName">
+                  <span class="input-group-addon">
+                    <i class="fa fa-upload" onclick="getElementById('appInstallKeyFileInput').click();"></i>
+                  </span>
+                </div>
+              </div>
+            </div>
+
+            <input class="ng-hide" type="submit" ng-disabled="appInstallForm.$invalid || busy"/>
+          </form>
         </div>
+        <div class="collapse" id="collapseMediaLinksCarousel" data-toggle="false">
+          <div ng-repeat="mediaLink in appInstall.mediaLinks" class="slick-item" style="background-image: url('{{mediaLink}}');" ng-show="appInstall.mediaLinks.length == 1"></div>
+          <slick init-onload="true" current-index="0" autoplay="true" arrows="false" autoplay-speed="2000" data="appInstall.mediaLinks" ng-show="appInstall.mediaLinks.length > 1">
+            <div ng-repeat="mediaLink in appInstall.mediaLinks" class="slick-item" style="background-image: url('{{mediaLink}}');"></div>
+          </slick>
+          <div class="appstore-install-description">
+            <div ng-bind-html="appInstall.app.manifest.description | markdown2html"></div>
+          </div>
+        </div>
+        <div class="collapse" id="collapseResourceConstraint" data-toggle="false">
+          <h4 class="text-danger">This Cloudron is running low on resources.</h4>
+          <p>Please upgrade to a server instance with more memory. Alternately, free up resources by uninstalling unused applications.</p>
+        </div>
+        <div class="collapse" id="collapseAppLimitReached" data-toggle="false">
+          <iframe ng-src="{{ 'https://cloudron.io/helper/premium_app.html?appstoreId=' + appInstall.app.manifest.appstoreId }}" style="width: 100%; height: 200px; border: none;"></iframe>
+        </div>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-default"data-dismiss="modal">Close</button>
+        <button type="button" class="btn btn-danger" ng-show="user.admin && appInstall.state === 'resourceConstraint'" ng-click="appInstall.showForm(true)">Install anyway</button>
+        <button type="button" class="btn btn-success" ng-show="appInstall.state === 'appInfo'" ng-click="appInstall.showForm()">Install</button>
+        <button type="button" class="btn btn-success" ng-show="appInstall.state === 'installForm'" ng-click="appInstall.submit()" ng-disabled="appInstallForm.$invalid || appInstall.busy"><i class="fa fa-circle-notch fa-spin" ng-show="appInstall.busy"></i> Install</button>
+        <a class="btn btn-success" ng-show="appInstall.state === 'appLimitReached'" ng-href="{{ config.webServerOrigin + '/console.html#/userprofile?view=subscriptions&email=' + subscription.emailEncoded + '&cloudronId=' + subscription.cloudronId }}" target="_blank">Setup Subscription</a>
+      </div>
     </div>
+  </div>
 </div>
 
 <!-- Modal app not found -->