Fix switching unit at runtime

Currently when switching units it only applies on restart

This code is a bit more verbose but it results in a binding reevaluation when the unit changes so the UI updates accordingly