Some Gui Bugs resolved