Added gui
merged