Fix bug in styles
Fix bug in styles 2
Small fixes in templates