Refactor of product view