updated controls and updated UI