fixed data-attribute issue and added tabindex