Change mode with button not working properly, can't see why

I see what you mean, good point, I'll check that tomorrow morning