Improved search layout and prevent Search to show up in navbar when we are in a search form