added delegate to picture
refactoring tweaks