updated gui
merged files