Template support added. Multiple UI changes.