structure and page fixes