Tooltips modified, bill-wrapper modified