#36 better dashboard