Gui button and other clean up