modified UI a little bit