More tweaking of dashboard code