Revert "Revert "Removing template dependency + UI changes""

This reverts commit 4711f7611b68e5febce5b6b9c633c524ca89326d.