Added validation and styling.
Fixed merge conflicts.