#4 - Fix references to image and update the UX filtering for the Admin to accommodate new types