Cleaned some things up, added static pages