Enhancement/css cleanup