Fixed some bugs in the dhasboard view