Simple ranking component + Some fixes