added some columns, sorting, formatting, and DRYed up form