Added overriding user bundle
Overriding templates