A fix to the model’s match function, and some toying with auto layout.