Fixing presentation layer