Working on improving the CSS and structure