Main menu restructured