Gui Modifications added
Reviewed by: Simon