UI improvements
Merge remote-tracking branch 'origin/master'
Script select box
Merge remote-tracking branch 'origin/master'