Changed more app_ids.

Made other small changes to template