changed routes and links
+ commited all