updated UI behavior

updated UI behavior