Vertically align the search toolbar
Update flexbox layout to work with Webkit and Firefox Nightly
Merge