Committing modification in admin and front end for product display
Merged changes update to PM-59