UI codes improvement