Detailed dashboard and refacor