Fix 3.5 inch layout issues