Filled slot should be 'main' instead of 'content-core' to get map viewlet

Also cleanup package template