Rework and simplify homepage