Made dashboard slightly more robust