Added UI Templater
Merge
Merge FIX!