filters div added and fixed
merge conflict fixed