Cleap up+ Toolkit import+ Updated UI code