Re-enforcing button states