Tabs order; minor style changes.