Integrated additional UI changes