Cleaned up css
css merge