better gui
gui merge