Massive change of layout to improve automatic conversion to jekyll layout