ENYO-2791: Fix small UI and component reset bug