UI elements inline with highlighting

I'll add a screenshot shortly, and it could be the case that these changes
should be moved to the newer user interface notebook.