Some improvement of GUI