Tweaking layout
Adding validations and simplifying layout again.