Fix Image Model and Controller

Somehow the Image model became corrupted in between pushes.