Reorg, fixes, cleanup of settings page