Added variables and finished primary navigation