Latest 15 packages fixed. Increased to 50 for more fun fix #237
Fix layout issues with latest