diff --git a/lib/NGCP/Panel/Field/BillingProfile.pm b/lib/NGCP/Panel/Field/BillingProfile.pm
index 216ac93812..04ba0d4388 100644
--- a/lib/NGCP/Panel/Field/BillingProfile.pm
+++ b/lib/NGCP/Panel/Field/BillingProfile.pm
@@ -16,9 +16,9 @@ has_field 'id' => (
 
 has_field 'create' => (
     type => 'Button',
-    label => 'or',
+    do_label => 0,
     value => 'Create Billing Profile',
-    element_class => [qw/btn btn-tertiary/],
+    element_class => [qw/btn btn-tertiary pull-right/],
 );
 
 1;
diff --git a/lib/NGCP/Panel/Field/BillingZone.pm b/lib/NGCP/Panel/Field/BillingZone.pm
index 5340ec57df..5ac956d854 100644
--- a/lib/NGCP/Panel/Field/BillingZone.pm
+++ b/lib/NGCP/Panel/Field/BillingZone.pm
@@ -16,9 +16,9 @@ has_field 'id' => (
 
 has_field 'create' => (
     type => 'Button',
-    label => 'or',
+    do_label => 0,
     value => 'Create Zone',
-    element_class => [qw/btn btn-tertiary/],
+    element_class => [qw/btn btn-tertiary pull-right/],
 );
 
 1;
diff --git a/lib/NGCP/Panel/Field/Contact.pm b/lib/NGCP/Panel/Field/Contact.pm
index 71c4aa092c..981ed7da12 100644
--- a/lib/NGCP/Panel/Field/Contact.pm
+++ b/lib/NGCP/Panel/Field/Contact.pm
@@ -16,9 +16,9 @@ has_field 'id' => (
 
 has_field 'create' => (
     type => 'Button',
-    label => 'or',
+    do_label => 0,
     value => 'Create Contact',
-    element_class => [qw/btn btn-tertiary/],
+    element_class => [qw/btn btn-tertiary pull-right/],
 );
 
 1;
diff --git a/lib/NGCP/Panel/Field/Contract.pm b/lib/NGCP/Panel/Field/Contract.pm
index cf737df5ff..7789843a36 100644
--- a/lib/NGCP/Panel/Field/Contract.pm
+++ b/lib/NGCP/Panel/Field/Contract.pm
@@ -16,9 +16,9 @@ has_field 'id' => (
 
 has_field 'create' => (
     type => 'Button',
-    label => 'or',
+    do_label => 0,
     value => 'Create Contract',
-    element_class => [qw/btn btn-tertiary/],
+    element_class => [qw/btn btn-tertiary pull-right/],
 );
 
 1;
diff --git a/lib/NGCP/Panel/Field/Domain.pm b/lib/NGCP/Panel/Field/Domain.pm
index 6d81abbef2..b84268ac99 100644
--- a/lib/NGCP/Panel/Field/Domain.pm
+++ b/lib/NGCP/Panel/Field/Domain.pm
@@ -16,9 +16,9 @@ has_field 'id' => (
 
 has_field 'create' => (
     type => 'Button',
-    label => 'or',
+    do_label => 0,
     value => 'Create Domain',
-    element_class => [qw/btn btn-tertiary/],
+    element_class => [qw/btn btn-tertiary pull-right/],
 );
 
 1;
diff --git a/lib/NGCP/Panel/Field/Reseller.pm b/lib/NGCP/Panel/Field/Reseller.pm
index da75cbc403..63c04165cb 100644
--- a/lib/NGCP/Panel/Field/Reseller.pm
+++ b/lib/NGCP/Panel/Field/Reseller.pm
@@ -16,9 +16,9 @@ has_field 'id' => (
 
 has_field 'create' => (
     type => 'Button',
-    label => 'or',
+    do_label => 0,
     value => 'Create Reseller',
-    element_class => [qw/btn btn-tertiary/],
+    element_class => [qw/btn btn-tertiary pull-right/],
 );
 
 1;
diff --git a/lib/NGCP/Panel/Field/ResellerContract.pm b/lib/NGCP/Panel/Field/ResellerContract.pm
index d70aa365d0..91ac281fba 100644
--- a/lib/NGCP/Panel/Field/ResellerContract.pm
+++ b/lib/NGCP/Panel/Field/ResellerContract.pm
@@ -16,9 +16,9 @@ has_field 'id' => (
 
 has_field 'create' => (
     type => 'Button',
-    label => 'or',
+    do_label => 0,
     value => 'Create Contract',
-    element_class => [qw/btn btn-tertiary/],
+    element_class => [qw/btn btn-tertiary pull-right/],
 );
 
 1;
diff --git a/share/static/css/main.css b/share/static/css/main.css
index a5c31bff5e..4f0502a3df 100644
--- a/share/static/css/main.css
+++ b/share/static/css/main.css
@@ -154,7 +154,7 @@ div.dataTables_paginate {
 ------------*/
 
 div.ngcp-modal .dataTables_wrapper {
-    padding: 5px;
+    /*padding: 5px;*/
 }
 
 div.ngcp-modal .control-group.error .dataTables_wrapper {
@@ -200,15 +200,19 @@ div.ngcp-modal .control-group.error .dataTables_wrapper input[type="text"] {
 /* -------------
   Various form fields
 ----------------*/
-input.ngcp_e164_cc {
-    width: 10%;
+.modal-body .control-group .controls > input[type="text"],
+.modal-body .control-group .controls > input[type="password"],
+.modal-body .control-group .controls > select {
+   padding: 4px 0;
+   width: 100%;
 }
-input.ngcp_e164_ac {
-    width: 10%;
+.modal-body .control-group .controls input.ngcp_e164_cc {
+    width: 15%;
 }
-input.ngcp_e164_sn {
-    width: 69.5%;
+.modal-body .control-group .controls input.ngcp_e164_ac {
+    width: 15%;
 }
-input {
-   width: 95%;
+.modal-body .control-group .controls input.ngcp_e164_sn {
+    width: 67%;
+    float: right;
 }