Added some validation, changed some css