changed back buttons on edit pages
Merge branch 'udaysaraf-fixBackButtons'