Cleanup a few loose ends.

* keeps the name unique with a case insensitive search
* clean up a view
* probably something else