More refined new UI-tools

Instead of pulling from my new-ui-tools branch, I merged that into my develop branch which I won't work on until this pull request goes through.