Updated ui Changes