Changed Details page
Conflicts resolved