CSS cleanups and fixes