CMS-2000 Live Edit: Create image component type (prototyping)
- Bug fixes and more refactoring