Updating picture_margin to return 0 when no picture_height or picture_width present