Improve navigation of dashboards