GUI modifications
Merge origin/master