New changes in the UI part