several changes for ui
name change