Move group menu from separate layout to parial