Quick UI update
Merge branch 'develop' of github.com:imulus/Archetype into develop