Refactor routes
Get the search form working