rearranged tables on settings page