Comment out the old annotation tables
Cope better with display of undef extensions
New "Add ..." link for each annotation type