changed how extra html for controls is handled. classes now used