Switch search button to buttonset
Merge branch 'master' of https://github.com/luckyx1/NACLA_2.0 into sort