Some fixes and Gui update