Dashboard Fixes