Revert "Revert "Fix favorites and Topics at top""

This reverts commit 9a5e22bc7277f82e2d287b8b4f599d4fdac6985c.