Revert changes to main URL file

There are some URL patterns that share a name, so order matters a lot.