add fragments, rework layouts