GUI update (Fix small bugs)