Still some more homepage clean-up