refactor Activities into Fragments; new content