ui misc improvements. more TODO.