CSS changes
Merged the Refactored codebase.


Signed-off-by: Amitav Roy <reachme@amitavroy.com>