css cleanup and additional layouts