UI updated.

changing controls to be done