added additional exemptions and fixed z-index