Issue #70 fix CP external pages