Added feedback on mode switch to surfaces