MDL-45893 user menu wip