improve UI and simple logic