Edits to highlight and buttons.