Final fixes
Merge pull request #9 from ChristianMurphy/Justin-Adding-Page

Final fixes