Product Module & some UI fixes