Fix names, change position of search bar in new trails page