menu fixes, navigation