menu activation

small changes to ensure menus are activated when they are supposed to be