settlement controller spec and added dropdowns
Merge branch 'master' into chris