Tweaking reorder to match & adding logic to only show if there is more than one attribute set