UI improvement

UI improvements