core-4876 fix UI issues