Fix product view
Seperate navigation into module