update Ui and resolve ETB issues