Clean up CSS. Part of issue #2