Tidy up - switched from Main content Fragments to Activities with Fragments.