more gui
merge fix