Integrated Map and Lot classes into project, modified UI code