Refactored, added a few pages