Added in Containers for Control, Label, Help, Infobox and Message (only implemented the first 2.)
Adjusted some naming.