fix core-selector
Update design