Added new column on report's page, also refactored code.