Modified GUI
Commit
Fixed conflicts