Fixed widget classes
Minor Changes