Fix picture stuff
Wrap user view object with view objects