Move the dropdown to the correct controller.
Merge branch 'server-client' of github.com:xinchejian/graham into server-client