Fixed some css and more validation