WIP - Refactoring start page