FMS-273 - DEBUG: Improve layout of ranking