Fixed few keyboard navigation issues