Cleanup
Fix rendering templates