Cleaning up html, adjusting content layout