Implemented new template behavior for Web UI