Added most of the controls