Modify partials for NavBar
Add seed for trails
Fix merge conflicts in seeds.rb