New Template Progress
User settings improved
Fixed conflict