Removed unneccessary tabIndex's, moved aria-expanded to trigger element