more work on templates and build new app version