added search state
merged conflict with product catalog
Refactored a bit
changed layout