Clean up.  More auto layout hell.