Adding keyboard navigation and fixing some errors.