Some changes and fix and template change

Why you didn't merge this ?