APO. New pages, popup normalize, previous fixes