simplify page templates
add blank store template
link store template
Bring in store-template changes after some cleanup