HUGE Dan requirements rearrange

I meant to break this up into a bunch of commits for each tab, but it is
all the UI rearranges from Dan