fixed layout and image saves on core data