UI tweaks

Show only what you need to see