Refactored markup to match new answer styling