Stories 7, 8, 9

Stories 8 and 9 are complete except for some minor styling issues. Story 7 partially complete.

If you want to merge this, I can open bugs on the issues I know to be outstanding so that they're easier to track.