Refactor to frontpage-model