Some changes to Online Broker
Fixed conflicts