Fixed menu indexing