Gui Modifications added
Reviewed by: Simon
Merge origin/master