more dashboard work

commit c67dac7