filtering by product type
it now searches correctly
improving visuallity of search box
fixing calculator
improving visual
Merge branch '2-4-stable'