CSS and cleanup final 2