Merged all fixed from blog template