Fixed some keyboard navigation bugs.