Shared UI clean#18

xnodeoncode wants to merge 4 commits intomainxnodeoncode/Aquiis:mainfrom

shared-ui-cleanxnodeoncode/Aquiis:shared-ui-cleanCopy head branch name to clipboard