minor changes on floorplan
merged some conflicts