Planned ui tweaks #3