New HTML structure, added event listeners for icons