Some small cleanups for code and view of CRImageController and subclasses