Tweaks to dashboard to fix #352