SONATA-148 - UI improvements