moving nag stuff from before class out of default layout