Tweaking reorder to match & adding logic to only show if there is more than one attribute set
Merge pull request #1437 from ronnieduke/develop

Tweaking reorder to match & adding logic to only show if there is more t...
Merge branch 'develop'