Gui update, small fixes