Fixing glass types and layout