Refactor more stuff for better working code.
Get the mockupImage directive working again.