bit more modified UI