Further work to make the badge view work with auto layout.