Reverting changes to fragment-profile, fixing some broken things in ProfileFragment, bad merge.