diff --git a/src/views/support.html b/src/views/support.html
index 814a03698..dd4b5e88b 100644
--- a/src/views/support.html
+++ b/src/views/support.html
@@ -5,32 +5,22 @@
   </div>
 
   <div class="text-left">
-    <h3>Documentation and Forum</h3>
+    <h3>Ticket</h3>
   </div>
 
   <div class="card">
       <div class="grid-item-top">
           <div class="row animateMeOpacity">
               <div class="col-lg-12">
-                  For user manuals and app development related questions, please refer to our <a href="{{ config.webServerOrigin }}/documentation.html" target="_blank"> documentation</a>.
-                  <br/><br/>
-                  For any other questions, search and ask in our <a href="https://forum.cloudron.io/" target="_blank">forum</a> or write to <a href="mailto:support@cloudron.io">support@cloudron.io</a>.
-              </div>
-          </div>
-      </div>
-  </div>
-
-  <div class="text-left">
-    <h3>Feedback</h3>
-  </div>
-
-  <div class="card">
-      <div class="grid-item-top">
-          <div class="row animateMeOpacity">
-              <div class="col-lg-12">
-                  We would love to hear your feedback. Help us improve our product by reporting any bugs or feature requests.
+                  Use this form to open support tickets. You can also write directly to <a href="mailto:support@cloudron.io">support@cloudron.io</a>.
                   <br/>
                   <br/>
+                  <ul>
+                    <li><a href="{{ config.webServerOrigin }}/documentation/apps/?support_view" target="_blank"> Knowledge Base & App Docs</a></li>
+                    <li><a href="{{ config.webServerOrigin }}/developer/packaging/?support_view" target="_blank"> Custom App Packaging & API</a></li>
+                    <li><a href="https://forum.cloudron.io/" target="_blank">Forum</a></li>
+                  </ul>
+                  <br/>
                   <form name="feedbackForm" ng-submit="submitFeedback()">
                       <div class="form-group">
                           <select class="form-control" name="type" style="width: 50%;" ng-model="feedback.type" required>
@@ -52,7 +42,7 @@
                       </div>
                       <button type="submit" class="btn btn-primary" ng-disabled="feedbackForm.$invalid || feedback.busy"><i class="fa fa-circle-o-notch fa-spin" ng-show="feedback.busy"></i> Submit</button>
                       <span ng-show="feedback.error" class="text-danger text-bold">{{feedback.error}}</span>
-                      <span ng-show="feedback.success" class="text-success text-bold">Thank You!</span>
+                      <span ng-show="feedback.success" class="text-success text-bold">Thanks, an email for sent to support@cloudron.io. We will get back shortly!</span>
                   </form>
               </div>
           </div>
@@ -70,7 +60,7 @@
                   Enable this option to allow Cloudron engineers to connect to this server via SSH.
                   <br/>
                   <br/>
-                  <b>Only enable this option if you were asked to do so from Cloudron support!</b>
+                  <b>Only enable this option if you were asked to do so by the Cloudron support team!</b>
                   <br/>
                   <br/>
                   <button class="btn" ng-class="{ 'btn-danger': !sshSupportEnabled, 'btn-primary': sshSupportEnabled }" ng-click="toggleSshSupport()">{{ sshSupportEnabled ? 'Disable SSH support access' : 'Enable SSH support access' }}</button>