Added fixes for customization template