Cleaned up templates and scss