Improving FrontPage component