Updated ui scheme