Improve dashboard with collapse