Fixed the dreaded dropdown !
Fixed the dreaded dropdown and merged.