Make sure search input field does not overflow
Merge, responsive layout fixes