misc annotation page cleanup/fixes, still needs a lot of work