ProductPresentation refactoring.
Fixes in product presentation