Fixes

Fix double slash, missing > in yield template, and duplicated ID