fix bad pull
updated product view, still needs david's work