mass changes related to new ui