fixes #3210: add .btn to .navbar-form to remove bottom margin, improve vertical align of contents of .navbar-form