Fixed menu navigation, various bug fixes