Fix Toolbar being primary, fix save > cancel