added UI improvements