More settings related changes, fix login template to not extend base again