Updated Links & fixed route problem