Fixed keyboard navigation bugs