Html fixes 24-10

Small html fixes

- Subcategory
- Edit topic/ New Topic
- code cleanup
Just to clarify, technically this will work, however coding wise it adds confusion.  This puts an expectation that two block elements are involved to create one block element if one is removed.  This creates potential for missing tags and is a bad practice.  I would suggest restoring the endif.