Design tidy

Haven't made any fundamental flow changes, just messed with the layouts of the individual pages to simplify them a bunch (mostly through language) and to add some consistency.