Gui updates, minor fixes