Add appropriate messages for system page