UI improvements
Query System & UI
Merge branch 'master' into develop