Add Settings and Search boilerplate
Fixed conflicts on routes