Clean up CSS a bit
More CSS refactor