Fix overflow issue when toolbar buttons wrap on narrow screens. Also move merge action into the record-toolbar (so it disables when a record has been edited)