Neha,D3 | #1604 | Baisc reorganization of styles