Fixes more issues with label layout