All Brokers have a BrokerAccountType
Fix the Broker list
Admin cleanup
More admin tweaks