Added the dropdown to the base view so all drop downs are automatic
Merge remote-tracking branch 'origin/master'