Fixed variable
Improved display
Merge branch 'product_feature'