Improve clone UI