Layout + CSS cleanups