fixed login and more templates