Dashboard: bug fixing