City to overhaul master plan