Refactor Item handlers to change HTML content on each event - swapped order
Fix merge conflict