Fixed up dashboard controller logic