Some CSS fixes, cleanup and simplification