UI improve and bug fix