Simplify component settings - do not wrap them in IModel when no necessa...

...ry