Updated to latest menu practices