Misc fixes and stylesheet reordering.