Sorting and Forms changes

Sorting and Forms changes