Dashboard changes

Updated Dashboard, fixed some logic and updated for new dashboard