UI improvements

UI improvements