UI changes into master