Improved and fixed validation and changed css classes to follow convention [CRP-25]