Re-factored a lot of CSS