improve UI a little