Cleaning up layout, reducing HTTP requests