NAIFD css changes & query fix