fix broken drop down, fix multiple login bug
fix merge conflicts