gui changes
merged