Fix merge issues on what page and prepare product image preview
Fix alignment of productNav categories