added the UI fixes