Refactoring of reports and Dashboard Re-design