cleaning and adding functionality, dashbaord