Update Configuration Menu

And lots of other changes as well.