Some fixes on dashboard