Refactoring Updating report/Index page