Fixes merge
Adding some styles to search view
Merges conflicts