GUI stuff

gooey
save first
Fix merge conflicts