AMEND: Break apart tags and allow for custom toggle and body