Updated City Module with menu functions