Restructured the HTML and added two way binding