Quickwins

Update product layout & fix price computation issue