Ajax template fixes; Clean up of settings.php; UI re-work