integrating ui changes