Finish up implementing sort order. Also change layout a bit.