26874 Add escape_admin and remove overlay