Added indicator for highlighting and button to deactivate it.