Short Code Cleanup
Template fixing and plugging in