several changes to UI