[CLEANUP] Code clean up

Change-Id: I2c334dba3633f69b55c72301b84452f7c5ed0aea
[TASK] Improve CSS for form

Change-Id: I23893f78e44388b8d4864ede6317955ca5ec73f9
[TASK] Add class on DOM element

Change-Id: I7a934d2b2743df688f06f0afb6455e40a6b23973