Adding sub pages, and fixed metadata