Fix #78 & #82 with data-width attribute