Add more data to button DOM for convenience. Reformat DOM creation code.