fixed some templates and added tabs
sdfd