Added gui
Merged