page level bugfixes