final grid changes. need to fix nav