Rejigged some templates to ease in the whiteboard app
minor improvements