Make dashboard a lot more efficient