conflict fix #2

added picture view elements