Fix navbar search position in Firefox

Also simplify html and CSS a bit in the process