Now preserves current menu item classes