Refactoring UI for better WCAG compliance [WIP]