Fixed CSS, cleaned up