Feature/links fixes