Fix layout syntax
Fix some syntax & add some products data & update product sub template