Made some changes to the UI and some data