Fixed menu loop