further generic efforts
Merge branch 'minisite'