Fixed some issue regarding the dashboard update