Hopefully finish GUI stuff
Fix a tiny bug