Added more settings and controls.