Put nav into layout & remove padding script