add drop down login form, all 30 model and feature specs green
fix merge conflicts