Fixed some of the spacing issues and simplified the CSS