GUI changes
Fixed merge conflict