Fix template watch, add generated menu boilerplate [1.5h]