Project Home page refactoring