bug fix and update GUI