changed merge to js sort, added css, filter NA