Better handling of size of margin notes.