Slighlty refactored the CSS