Fixing presentation issues