Improve UI. Fix IOs break during CLI-prepare