Refactored code, pages combines to single view
Refactored code, pages combines to single view