changed some templates and sassy sass files