Fixed photo support, associated layout/format changes