Order content types for #296.

Also took the opportunity to clean up how we get the display name and present them on the feed#edit page.