GUI Tweaks in code structure

Reviewed by: Simon
Merge origin/master