Picture plugin: Add support for width and height

Model updated with supporting fields to hold width/height, template now uses same.