Refactoring front page