added user migration and template fixes