more keyboard navigation fixes