Dashboard now using templates