Rework and simplify homepage
Rebase branch