UI-3288: crash website - fix UI bugs