Improve routes, add header