New app - fixed various issues related to getActivity() potentially returning null when in a Fragment