chore(web): Merge branch 'refactor/web/corrective-layout-abstraction' into feat/web/subkey-corrections