get rid of !important
improve ARIA and refactoring