Large changes to the state page.

All the changes listed in my previous commit.