Minor GUI changes
Merge origin/master