Refactor Main Index View