updated changes from ux upadtes