merged the ui changes