General clean up and changed button to wire by id.