Fix search box overflow and btn location

Closes #866,