Fragments!

Big code cleanup so I use a ListFragment.  Things seem to actually work!
Also, renaming things for consistency.