Dashboard + minor fixes