template UI ticket fixes
Merge pull request #34 from vasanth-hooduku/master

template UI ticket fixes