More styling fixes and stuff.
Pretty close to a final draft.