#17 Externalized the map menu