RFR: Ui updates

ui changes from Jakub