Simplify logic in Dashboard Cont. for shouts