Fix and tweak button and grid deprecations