Clean up UI nits