FIX layout correction