FIX layouts for better rendering performance