[master] ui fixes