Got GUI things almost done.
Merge remote-tracking branch 'origin/master'