Challenge set 4

Yet more changes, trying to get the top nav to look like the example.