Refactored topic forms