Improve entering town
Update menus