Cleaned up routes, added support for old links