Add/Delete pages bugfixes