Added path to page data
Improved images renderer