Updated the the markup to make it more accessible for keyboard navigation