Clean up & fix structure of layout.jade