Clean layout

Clean layout and correct button usage with validation of fields