HOT FIX layout