fix menu and access bugs