general front end, add floorplan and pics
fix conflicts