Refactor frontpage and rebuild