Switching from Safe to Normal mode and back again: Diagnostic Mode

Is there really no easier way to switch from regular mode to Safe mode
or the other way around,, except by fully logging into windows, then
using MSCONFIG, changing it and restarting windows?

Seems to me there should be a way to choose at the start, and with prior
versions, if I had a crash, the next time windows started it gave me the
choise of normal startup, safe mode, save mode with internet, cmd
screen, etc. Now it just lets me start again


Also, I set msconfig for Diagnostic Startup, because it was placed
between Full and Selective and diagnosis seemed like a good thing but
after restart it was in Safe mode anyhow!!