Final tweaks; still breaks AutoLayout constraints, though