Some design changes (mainly organizing the CSS file)