Added images and field collapsing