More work on settings menu, just cosmetics left.

I keep vacillating on how to name some of the files\classes. Silly, I
know, right?