Fix tap handling on actions toolbar and better structure highlighting code.