Fix arrow z-index
Avoid lowercasing options