Updated and added new controls.
Many improvements.