Add selectize
Misc fixes and cleanup