Fix unit rank display (not tested for performance)
Fixes #408
Fixes #410