Various fixes for html changes in dashboard