Updates to Menu System (fix all_data with page_data)