Further dashboard iteration, see #226