Changed buttons and field ID's