Remove jade layout partials
Fix merge conflicts