Changed the CSS and refactored a little bit