Rework homepage layout