Cleaning up of Page and some code-cleanup.
Merge pull request #68 from Firesphere/Development

Cleaning up of Page and some code-cleanup.