added UI improved