Move depression notice
Fix template not found error
Merge branch 'master' into erich_dev