Making top nav work, additional changes to sample data generator