showing ranks, positioning fixes
Merge remote-tracking branch 'origin/master'