More Gui changes, as well as some logic stuff