Added validations, css fixes