Improve routes, add potrait with icons