Styling tweaks to org switcher.

Pull request to hold pre and post demo styling tweaks.