diff --git a/app/components/forms/orders/order-form.js b/app/components/forms/orders/order-form.js
index 8dead19d533..979b1ba925b 100644
--- a/app/components/forms/orders/order-form.js
+++ b/app/components/forms/orders/order-form.js
@@ -5,7 +5,6 @@ import { run } from '@ember/runloop';
 import { inject as service } from '@ember/service';
 import FormMixin from 'open-event-frontend/mixins/form';
 import moment from 'moment';
-import { countries } from 'open-event-frontend/utils/dictionary/demography';
 import { groupBy, orderBy } from 'lodash-es';
 import {
   compulsoryProtocolValidUrlPattern, validTwitterProfileUrlPattern, validFacebookProfileUrlPattern,
@@ -467,10 +466,6 @@ export default Component.extend(FormMixin, {
     return groupBy(this.fields.toArray(), field => field.get('form'));
   }),
 
-  countries: computed(function() {
-    return orderBy(countries, 'name');
-  }),
-
   genders: orderBy(genders, 'name'),
 
   actions: {
diff --git a/app/components/widgets/forms/billing-info.js b/app/components/widgets/forms/billing-info.js
new file mode 100644
index 00000000000..a360fe8bd08
--- /dev/null
+++ b/app/components/widgets/forms/billing-info.js
@@ -0,0 +1,10 @@
+import { countries } from 'open-event-frontend/utils/dictionary/demography';
+import Component from '@ember/component';
+import { computed } from '@ember/object';
+import { orderBy } from 'lodash-es';
+
+export default Component.extend({
+  countries: computed(function() {
+    return orderBy(countries, 'name');
+  })
+});
\ No newline at end of file
diff --git a/app/routes/events/view/sessions/create.js b/app/routes/events/view/sessions/create.js
index b5004d32b4c..697c6d33f28 100644
--- a/app/routes/events/view/sessions/create.js
+++ b/app/routes/events/view/sessions/create.js
@@ -9,7 +9,7 @@ export default Route.extend({
     return {
       event : eventDetails,
       form  : await eventDetails.query('customForms', {
-        'page[size]' : 50,
+        'page[size]' : 0,
         sort         : 'id'
       }),
       speakers: await eventDetails.query('speakers', {
diff --git a/app/routes/events/view/sessions/edit.js b/app/routes/events/view/sessions/edit.js
index ec2130642e2..f9b5a645cd8 100644
--- a/app/routes/events/view/sessions/edit.js
+++ b/app/routes/events/view/sessions/edit.js
@@ -11,7 +11,7 @@ export default Route.extend(AuthenticatedRouteMixin, {
     return {
       event : eventDetails,
       form  : await eventDetails.query('customForms', {
-        'page[size]' : 50,
+        'page[size]' : 0,
         sort         : 'id'
       }),
       session: await this.store.findRecord('session', params.session_id, {
diff --git a/app/routes/events/view/speakers/create.js b/app/routes/events/view/speakers/create.js
index 63f84bfae6f..4fb24d6f957 100644
--- a/app/routes/events/view/speakers/create.js
+++ b/app/routes/events/view/speakers/create.js
@@ -9,7 +9,7 @@ export default Route.extend({
     return {
       event : eventDetails,
       form  : await eventDetails.query('customForms', {
-        'page[size]' : 50,
+        'page[size]' : 0,
         sort         : 'id'
       }),
       session: await this.store.createRecord('session', {
diff --git a/app/routes/events/view/speakers/edit.js b/app/routes/events/view/speakers/edit.js
index bd4eefedf9c..4499282d73b 100644
--- a/app/routes/events/view/speakers/edit.js
+++ b/app/routes/events/view/speakers/edit.js
@@ -11,7 +11,7 @@ export default Route.extend(AuthenticatedRouteMixin, {
     return {
       event : eventDetails,
       form  : await eventDetails.query('customForms', {
-        'page[size]' : 50,
+        'page[size]' : 0,
         sort         : 'id'
       }),
       speaker: await this.store.findRecord('speaker', params.speaker_id)
diff --git a/app/routes/public/cfs/edit-session.js b/app/routes/public/cfs/edit-session.js
index 3a3202bd2e3..1ff25b0fb91 100644
--- a/app/routes/public/cfs/edit-session.js
+++ b/app/routes/public/cfs/edit-session.js
@@ -11,7 +11,7 @@ export default Route.extend({
       event : eventDetails,
       forms : await eventDetails.query('customForms', {
         sort         : 'id',
-        'page[size]' : 50
+        'page[size]' : 0
       }),
       session: await this.store.findRecord('session', params.session_id, {
         include: 'session-type,track'
diff --git a/app/routes/public/cfs/edit-speaker.js b/app/routes/public/cfs/edit-speaker.js
index c0e91330fde..ccbf7167c35 100644
--- a/app/routes/public/cfs/edit-speaker.js
+++ b/app/routes/public/cfs/edit-speaker.js
@@ -11,7 +11,7 @@ export default Route.extend({
       event : eventDetails,
       forms : await eventDetails.query('customForms', {
         sort         : 'id',
-        'page[size]' : 50
+        'page[size]' : 0
       }),
       speaker: await this.store.findRecord('speaker', params.speaker_id)
     };
diff --git a/app/utils/file.js b/app/utils/file.js
index fec8f48207e..f9dc58bc631 100644
--- a/app/utils/file.js
+++ b/app/utils/file.js
@@ -33,7 +33,7 @@ export const isFileValid = (file, maxSizeInMb, fileTypes = []) => {
           header += arr[i].toString(16);
         }
         let type;
-        // Magic number reference: from http://www.astro.keele.ac.uk/oldusers/rno/Computing/File_magic.html
+        // Magic number reference: from http://www.astro.keele.ac.uk/oldusers/rno/Computing/File_magic.html & http://en.wikipedia.org/wiki/List_of_file_signatures
         switch (header) {
           case '89504e47':
             type = 'image/png';
@@ -44,6 +44,8 @@ export const isFileValid = (file, maxSizeInMb, fileTypes = []) => {
           case 'ffd8ffe0':
           case 'ffd8ffe1':
           case 'ffd8ffe2':
+          case 'ffd8ffdb':
+          case 'ffd8ffee':
             type = 'image/jpeg';
             break;
           case '25504446':