Rename variables, make links on home work