EDIT profile and template

This PR depends on View Profile and template PR, because of which tests are failing ,once that is merged it will be rebased.
Good catch, I will use this option as well.