Bug fixes in dashboard