Added validation and did some styling