Updates to base template and navigation between 1st 2 exercises