Dashboard + some minor bug fixed