Fixing bugs with dashboard