Various fixing up with the SComponent enumeration class.

Made the home screen request focus.
Various things which I have forgotten