Update layout and add validations