updated base and login template