Updates with fixes for Isotope

Reversed from FIlippos dev server