Fix bugs in dashboard