[Study] Refactor views and templates
[Study] Overcome add modal added on edit study view
[Study] More refactor