UI improvements:
- header selection
- header highlighting
- highlight and selection drawn together
- only drawing needed selection and highlights