Fixed some loose ends when creating page without a template selected