Fixes on dashboard logic