Fix Bug 965665, keep case sensitive checkbox on same line, and other tweaks
Merge branch 'bug965665-keep-case-sensitivity-checkbox-and-query-on-same-line' into ui fixes Bug 965665