Refactoring to inline annotation listing and forms