Dashboard back, fix #14