menuing changes wip