Can we move the pictures into a 'picture' object? This will make template coding a lot easier in the UI.