Change PictureWidth/Height to properties