Add GUI
Fixed conflicts