CONTRIB-002: Update the architecture and fix some accessibility issues.