layout.jade - various changes