Made last changes minus the team page