Adding data-id attributes to the DOM elements, fixing CSS padding.