Added more server side validation, changed some glyphicons