Moving the rest of the presentation templates into mustache templates