Switch button references to match switch of buttons

Switched buttons tags to default = 1 position, but forgot to switch
references.  So am doing so now.