Cleaned up templates and added default content.