Add close to toggles and sorting z-index