refine UI a little bit