Added price-loading text and put prices into a LinearLayout
Merge remote-tracking branch 'origin/master'