FIX WCAG AA issues