Changed routes and add icons