Fix types class. Add padding for controls