Fixed constraint for main view
fixed conflicts
merged fix for 3.5 inch overlap