Working on changes from Andy and also making template for PerspectivesDetails
Merge branch 'origin/master'