FrontPageBundel refactor