Added sort functionality, new columns, etc.