Fixed bugs after merging
Layout.jade now well organised