Updated the following files for the below listed functionality
1) The issues that were found on testing in admin section.