Minor changes in picture container logic.