Revert "Removing template dependency + UI changes"

This reverts commit 2f6c55b79780c52d1507e707abc1de0c40c958f4.