fix positioning problems and leaders array reindex