Fixed routes
Fixed message links