Fixing presentation bugs