Hey @Angel_Ramos ! In order to swap buttons without having to interfere with the flow, you might want to check out the new Figma Variant Properties within a component. This will help you not only organize you UI Kit and buttons, but it will also allow you to swap buttons without having to disrupt the flow.

You can check out some more information about Variant Properties here:

https://help.figma.com/hc/en-us/articles/360056440594-Create-and-use-variants#:~:text=Variant%20properties%20are%20a%20type,components%20in%20your%20design%20system.