Revert "Revert "merge""

This reverts commit 751166e458bfb280aeb664e18933083281cc7d4c.
MainPage fix for dispersia's commit.