INFRA-43: fixed markup
INFRA-43: migrated the last pages