Restored constraints so iPad lays out correctly, but lost some of iPhone layout in process.