Agreed. Can we have all markup in the template. Makes things a lot more readable.