gui update and bug fix