Try to fix some auto layout issues