Images on Create + bugfix