merge; updated main page + filters
merge; updated main page + filters
products model update
merge fix
update
reset to previous filters desing
merge
merge