Add sorting and other form style improvements