Added remaining ranking items, fixed some form bugs
Fixed ranking bug