Improvement on UI