removed brokers/general accounts, changed UI for new requirements