reworking both FragmentActivity classes a bit