case 4248 - Margins, inputs styling for forms.
Merge branch 'case-4248' into development