changing the layouts to fix merging errors
Integrating cache with picture view