Adjust layout, clean up redundant CSS and HTML