CSS cleanup. grouping related items. Please test and let me know if
results are as expected 

Change-Id: I13900a832b31dc724a142178a9d7263125633ed7
Signed-off-by: Pavan <pavankowshik@gmail.com>