Adding much more flexibility, removing dependency on vespakoen/menu