Added validations and design tweaks