Ui toolkit + less structure update