More CSS cleanups