adapt css to change to merge files
To merge changes done by Vanessa
Adjust some fields and validation rules