Fixed custom report issue and changed dashbord work flow