[master] UI fixes