Updated ui/split code into components