Added tabular form and tooltips