Rolling back changes to make sure only sticky nav additions are included in this branch