redo the layout, add subtle functionalities, clean floorplan