Shuffled a bunch of the heading stuff around to have it make more sense. Fixes the back button navigation dilemma.