new gem and FIX layout