Rationalised contributed list repositioning code + minor improvements