Update UI and Code base on suggestions of the emails