Dynamic Links

Removed some hardcoded links and replaced them with dynamic ones.