[ui_enhancements] Initial commit of exiting script with fixes and
cleanup.