Clean up layout and use it on homepage.