Added Validation and styling