Ability to view index on separate page
Small refactoring