Added bus and seating, changed layout