Fixed link variable names in layout