Fixed up pages and spacing

- Should be somewhat stable at this point