modified UI a bit