Auto-layout changes

Fix for iPad