Moved question_select to the views folder.  Fixed something I missed in a merge conflict