Add select-box
Fix select-box issue