Fix highlighting elements on roster

Fixes some drawing issues as well