Re-aranged population tabs. Small cleanup.