Fixing ugly presentation