picture template adaptions

the template structure needs adaptions to comply with pinder!49 (merged) and and pinder!55 (merged)
cc @jeanggi90