More styling and some ordering consistency.