worked on dashboard
fixed merge