Made the base activity extend FragmentActivity
Reorganized things a little