More changes for previews + nav - N