finished shop the look design
Merge remote-tracking branch 'origin/eric' into bala