Added classes for basic controls