Joined with the product model

Updated controllers
Updated views