Clean up top right corner of dashboard

as described in issue #596.