Added money type
Fixed layouts to not fail when being used without the layout class variable in the definition.