Sorting and style tweaks

SSIA