Re-added sort styles. closes #663, closes #664