Updated Links and Route for Customer Section
Fixed Conflicts