Added functionality for moving between pages
Removed commented out code