Client side changes

Removed - JS redundancy
Added - Organization picker (w/o DB connectivity)