Fix display issues on some pages, more to come