Moved everything to Fragments