Fix Ajax Gallery issues

In Progress