Minor reworking of the merge button layout, which also allows the visibility to work...