Reorganized the buttons in the headers, for better consistency (e.g. Search/Browse is always left)