Cleaned up some broken templates