Unit-tab changes (mostly)