some styling changes and initial floorplan
Resolving conflicts