Improved xs sm displays / Improved officer/candidate directory display