Move button states to public ivar