Nits and tweeks to base ui