UI updates; the commit e53b90 was old one