rename namespaces and add refresh fn and button-ids for states
It breathes!