Add: Layout with header and scripts support / Some other changes