Added toolbar
Started using City class for terrain management