Tweaking reorder to match & adding logic to only show if there is more t...

...han one attribute set