Significant rewrite: space and nvu template added